mirror of
https://github.com/oxen-io/lokinet.git
synced 2024-11-17 15:25:35 +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).
134 lines
3.7 KiB
C++
134 lines
3.7 KiB
C++
#pragma once
|
|
|
|
#include <sqlite_orm/sqlite_orm.h>
|
|
|
|
#include "types.hpp"
|
|
|
|
/// Contains some code to help deal with sqlite_orm in hopes of keeping other headers clean
|
|
|
|
namespace llarp
|
|
{
|
|
inline auto
|
|
initStorage(const std::string& file)
|
|
{
|
|
using namespace sqlite_orm;
|
|
return make_storage(
|
|
file,
|
|
make_table(
|
|
"peerstats",
|
|
make_column("routerId", &PeerStats::routerId, primary_key(), unique()),
|
|
make_column("numConnectionAttempts", &PeerStats::numConnectionAttempts),
|
|
make_column("numConnectionSuccesses", &PeerStats::numConnectionSuccesses),
|
|
make_column("numConnectionRejections", &PeerStats::numConnectionRejections),
|
|
make_column("numConnectionTimeouts", &PeerStats::numConnectionTimeouts),
|
|
make_column("numPathBuilds", &PeerStats::numPathBuilds),
|
|
make_column("numPacketsAttempted", &PeerStats::numPacketsAttempted),
|
|
make_column("numPacketsSent", &PeerStats::numPacketsSent),
|
|
make_column("numPacketsDropped", &PeerStats::numPacketsDropped),
|
|
make_column("numPacketsResent", &PeerStats::numPacketsResent),
|
|
make_column("numDistinctRCsReceived", &PeerStats::numDistinctRCsReceived),
|
|
make_column("numLateRCs", &PeerStats::numLateRCs),
|
|
make_column("peakBandwidthBytesPerSec", &PeerStats::peakBandwidthBytesPerSec),
|
|
make_column("longestRCReceiveInterval", &PeerStats::longestRCReceiveInterval),
|
|
make_column("leastRCRemainingLifetime", &PeerStats::leastRCRemainingLifetime)));
|
|
}
|
|
|
|
using PeerDbStorage = decltype(initStorage(""));
|
|
|
|
} // namespace llarp
|
|
|
|
/// "custom" types for sqlite_orm
|
|
/// reference: https://github.com/fnc12/sqlite_orm/blob/master/examples/enum_binding.cpp
|
|
namespace sqlite_orm
|
|
{
|
|
/// llarp_time_t serialization
|
|
template <>
|
|
struct type_printer<llarp_time_t> : public integer_printer
|
|
{};
|
|
|
|
template <>
|
|
struct statement_binder<llarp_time_t>
|
|
{
|
|
int
|
|
bind(sqlite3_stmt* stmt, int index, const llarp_time_t& value)
|
|
{
|
|
return statement_binder<int64_t>().bind(stmt, index, value.count());
|
|
}
|
|
};
|
|
|
|
template <>
|
|
struct field_printer<llarp_time_t>
|
|
{
|
|
std::string
|
|
operator()(const llarp_time_t& value) const
|
|
{
|
|
return fmt::format("{}", value.count());
|
|
}
|
|
};
|
|
|
|
template <>
|
|
struct row_extractor<llarp_time_t>
|
|
{
|
|
llarp_time_t
|
|
extract(const char* row_value)
|
|
{
|
|
int64_t raw = static_cast<int64_t>(atoi(row_value));
|
|
return llarp_time_t(raw);
|
|
}
|
|
|
|
llarp_time_t
|
|
extract(sqlite3_stmt* stmt, int columnIndex)
|
|
{
|
|
auto str = sqlite3_column_text(stmt, columnIndex);
|
|
return this->extract((const char*)str);
|
|
}
|
|
};
|
|
|
|
/// RouterID serialization
|
|
template <>
|
|
struct type_printer<llarp::RouterID> : public text_printer
|
|
{};
|
|
|
|
template <>
|
|
struct statement_binder<llarp::RouterID>
|
|
{
|
|
int
|
|
bind(sqlite3_stmt* stmt, int index, const llarp::RouterID& value)
|
|
{
|
|
return statement_binder<std::string>().bind(stmt, index, value.ToString());
|
|
}
|
|
};
|
|
|
|
template <>
|
|
struct field_printer<llarp::RouterID>
|
|
{
|
|
std::string
|
|
operator()(const llarp::RouterID& value) const
|
|
{
|
|
return value.ToString();
|
|
}
|
|
};
|
|
|
|
template <>
|
|
struct row_extractor<llarp::RouterID>
|
|
{
|
|
llarp::RouterID
|
|
extract(const char* row_value)
|
|
{
|
|
llarp::RouterID id;
|
|
if (not id.FromString(row_value))
|
|
throw std::runtime_error("Invalid RouterID in sqlite3 database");
|
|
|
|
return id;
|
|
}
|
|
|
|
llarp::RouterID
|
|
extract(sqlite3_stmt* stmt, int columnIndex)
|
|
{
|
|
auto str = sqlite3_column_text(stmt, columnIndex);
|
|
return this->extract((const char*)str);
|
|
}
|
|
};
|
|
|
|
} // namespace sqlite_orm
|