mirror of
https://github.com/oxen-io/lokinet
synced 2023-12-14 06:53:00 +01: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).
77 lines
1.9 KiB
C++
77 lines
1.9 KiB
C++
#include "fs.hpp"
|
|
|
|
#include <llarp/util/logging.hpp>
|
|
#include <llarp/util/formattable.hpp>
|
|
|
|
#include <fcntl.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/types.h>
|
|
#include <system_error>
|
|
|
|
#ifdef WIN32
|
|
#include <io.h>
|
|
#else
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
namespace llarp
|
|
{
|
|
namespace util
|
|
{
|
|
static std::error_code
|
|
errno_error()
|
|
{
|
|
int e = errno;
|
|
errno = 0;
|
|
return std::make_error_code(static_cast<std::errc>(e));
|
|
}
|
|
|
|
error_code_t
|
|
EnsurePrivateFile(fs::path pathname)
|
|
{
|
|
errno = 0;
|
|
error_code_t ec = errno_error();
|
|
const auto str = pathname.string();
|
|
if (fs::exists(pathname, ec)) // file exists
|
|
{
|
|
auto st = fs::status(pathname);
|
|
auto perms = st.permissions();
|
|
if ((perms & fs::perms::others_exec) != fs::perms::none)
|
|
perms = perms ^ fs::perms::others_exec;
|
|
if ((perms & fs::perms::others_write) != fs::perms::none)
|
|
perms = perms ^ fs::perms::others_write;
|
|
if ((perms & fs::perms::others_write) != fs::perms::none)
|
|
perms = perms ^ fs::perms::others_write;
|
|
if ((perms & fs::perms::group_read) != fs::perms::none)
|
|
perms = perms ^ fs::perms::group_read;
|
|
if ((perms & fs::perms::others_read) != fs::perms::none)
|
|
perms = perms ^ fs::perms::others_read;
|
|
if ((perms & fs::perms::owner_exec) != fs::perms::none)
|
|
perms = perms ^ fs::perms::owner_exec;
|
|
|
|
fs::permissions(pathname, perms, ec);
|
|
if (ec)
|
|
llarp::LogError("failed to set permissions on ", pathname);
|
|
}
|
|
else // file is not there
|
|
{
|
|
errno = 0;
|
|
int fd = ::open(str.c_str(), O_RDWR | O_CREAT, 0600);
|
|
ec = errno_error();
|
|
if (fd != -1)
|
|
{
|
|
::close(fd);
|
|
}
|
|
}
|
|
|
|
#ifndef WIN32
|
|
if (ec)
|
|
llarp::LogError("failed to ensure ", str, ", ", ec.message());
|
|
return ec;
|
|
#else
|
|
return {};
|
|
#endif
|
|
}
|
|
} // namespace util
|
|
} // namespace llarp
|