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).
40 lines
808 B
C++
40 lines
808 B
C++
#include "bootstrap.hpp"
|
|
#include "util/bencode.hpp"
|
|
#include "util/logging.hpp"
|
|
#include "util/logging/buffer.hpp"
|
|
|
|
namespace llarp
|
|
{
|
|
void
|
|
BootstrapList::Clear()
|
|
{
|
|
clear();
|
|
}
|
|
|
|
bool
|
|
BootstrapList::BDecode(llarp_buffer_t* buf)
|
|
{
|
|
return bencode_read_list(
|
|
[&](llarp_buffer_t* b, bool more) -> bool {
|
|
if (more)
|
|
{
|
|
RouterContact rc{};
|
|
if (not rc.BDecode(b))
|
|
{
|
|
LogError("invalid rc in bootstrap list: ", llarp::buffer_printer{*b});
|
|
return false;
|
|
}
|
|
emplace(std::move(rc));
|
|
}
|
|
return true;
|
|
},
|
|
buf);
|
|
}
|
|
|
|
bool
|
|
BootstrapList::BEncode(llarp_buffer_t* buf) const
|
|
{
|
|
return BEncodeWriteList(begin(), end(), buf);
|
|
}
|
|
} // namespace llarp
|