mirror of
https://github.com/oxen-io/lokinet.git
synced 2024-11-15 12:13:24 +00:00
b81f7025c9
Replaces custom logging system with spdlog-based oxen logging. This
commit mainly replaces the backend logging with the spdlog-based system,
but doesn't (yet) convert all the existing LogWarn, etc. to use the new
format-based logging.
New logging statements will look like:
llarp::log::warning(cat, "blah: {}", val);
where `cat` should be set up in each .cpp or cluster of .cpp files, as
described in the oxen-logging README.
As part of spdlog we get fmt, which gives us nice format strings, where
are applied generously in this commit.
Making types printable now requires two steps:
- add a ToString() method
- add this specialization:
template <>
constexpr inline bool llarp::IsToStringFormattable<llarp::Whatever> = true;
This will then allow the type to be printed as a "{}" value in a
fmt::format string. This is applied to all our printable types here,
and all of the `operator<<` are removed.
This commit also:
- replaces various uses of `operator<<` to ToString()
- replaces various uses of std::stringstream with either fmt::format or
plain std::string
- Rename some to_string and toString() methods to ToString() for
consistency (and to work with fmt)
- Replace `stringify(...)` and `make_exception` usage with fmt::format
(and remove stringify/make_exception from util/str.hpp).
83 lines
1.9 KiB
C++
83 lines
1.9 KiB
C++
#ifndef LLARP_DHT_TX
|
|
#define LLARP_DHT_TX
|
|
|
|
#include "key.hpp"
|
|
#include "txowner.hpp"
|
|
#include <llarp/util/logging.hpp>
|
|
#include <llarp/util/status.hpp>
|
|
|
|
#include <set>
|
|
#include <vector>
|
|
|
|
namespace llarp
|
|
{
|
|
namespace dht
|
|
{
|
|
struct AbstractContext;
|
|
|
|
template <typename K, typename V>
|
|
struct TX
|
|
{
|
|
K target;
|
|
AbstractContext* parent;
|
|
std::set<Key_t> peersAsked;
|
|
std::vector<V> valuesFound;
|
|
TXOwner whoasked;
|
|
|
|
TX(const TXOwner& asker, const K& k, AbstractContext* p)
|
|
: target(k), parent(p), whoasked(asker)
|
|
{}
|
|
|
|
virtual ~TX() = default;
|
|
|
|
void
|
|
OnFound(const Key_t& askedPeer, const V& value);
|
|
|
|
util::StatusObject
|
|
ExtractStatus() const
|
|
{
|
|
util::StatusObject obj{
|
|
{"whoasked", whoasked.ExtractStatus()}, {"target", target.ExtractStatus()}};
|
|
std::vector<util::StatusObject> foundObjs;
|
|
std::transform(
|
|
valuesFound.begin(),
|
|
valuesFound.end(),
|
|
std::back_inserter(foundObjs),
|
|
[](const auto& item) -> util::StatusObject { return item.ExtractStatus(); });
|
|
|
|
obj["found"] = foundObjs;
|
|
std::vector<std::string> asked;
|
|
std::transform(
|
|
peersAsked.begin(),
|
|
peersAsked.end(),
|
|
std::back_inserter(asked),
|
|
[](const auto& item) -> std::string { return item.ToString(); });
|
|
obj["asked"] = asked;
|
|
return obj;
|
|
}
|
|
|
|
virtual bool
|
|
Validate(const V& value) const = 0;
|
|
|
|
virtual void
|
|
Start(const TXOwner& peer) = 0;
|
|
|
|
virtual void
|
|
SendReply() = 0;
|
|
};
|
|
|
|
template <typename K, typename V>
|
|
inline void
|
|
TX<K, V>::OnFound(const Key_t& askedPeer, const V& value)
|
|
{
|
|
peersAsked.insert(askedPeer);
|
|
if (Validate(value))
|
|
{
|
|
valuesFound.push_back(value);
|
|
}
|
|
}
|
|
} // namespace dht
|
|
} // namespace llarp
|
|
|
|
#endif
|