mirror of
https://github.com/XRPLF/rippled.git
synced 2026-07-16 03:30:20 +00:00
Compare commits
29 Commits
develop
...
copilot/re
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3b1e9f2a8a | ||
|
|
4b7a21bdfe | ||
|
|
f956135e29 | ||
|
|
3e4422df28 | ||
|
|
9f5bf51b31 | ||
|
|
9ccb7742ca | ||
|
|
336b9c101e | ||
|
|
5fdbedf6ac | ||
|
|
ce4490d793 | ||
|
|
ba2ff93d6e | ||
|
|
4714160052 | ||
|
|
5147825d61 | ||
|
|
719368ae25 | ||
|
|
3e372656d3 | ||
|
|
81964068a1 | ||
|
|
2e0ea38d7d | ||
|
|
aa1f84e226 | ||
|
|
ae7076c054 | ||
|
|
9a221d1291 | ||
|
|
5e6d8a4692 | ||
|
|
11c7d912f6 | ||
|
|
b7d6cdf713 | ||
|
|
193ddcbfac | ||
|
|
3a70d9dfba | ||
|
|
03e8a68670 | ||
|
|
28143d74af | ||
|
|
ff4c538a9f | ||
|
|
9fe94c47c3 | ||
|
|
3f307f8128 |
@@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <boost/filesystem.hpp>
|
#include <filesystem>
|
||||||
|
|
||||||
namespace xrpl {
|
namespace xrpl {
|
||||||
|
|
||||||
@@ -13,6 +13,6 @@ namespace xrpl {
|
|||||||
* @throws runtime_error
|
* @throws runtime_error
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
extractTarLz4(boost::filesystem::path const& src, boost::filesystem::path const& dst);
|
extractTarLz4(std::filesystem::path const& src, std::filesystem::path const& dst);
|
||||||
|
|
||||||
} // namespace xrpl
|
} // namespace xrpl
|
||||||
|
|||||||
@@ -1,24 +1,23 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <boost/filesystem.hpp>
|
|
||||||
#include <boost/system/error_code.hpp>
|
|
||||||
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
|
#include <filesystem>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <system_error>
|
||||||
|
|
||||||
namespace xrpl {
|
namespace xrpl {
|
||||||
|
|
||||||
std::string
|
std::string
|
||||||
getFileContents(
|
getFileContents(
|
||||||
boost::system::error_code& ec,
|
std::error_code& ec,
|
||||||
boost::filesystem::path const& sourcePath,
|
std::filesystem::path const& sourcePath,
|
||||||
std::optional<std::size_t> maxSize = std::nullopt);
|
std::optional<std::size_t> maxSize = std::nullopt);
|
||||||
|
|
||||||
void
|
void
|
||||||
writeFileContents(
|
writeFileContents(
|
||||||
boost::system::error_code& ec,
|
std::error_code& ec,
|
||||||
boost::filesystem::path const& destPath,
|
std::filesystem::path const& destPath,
|
||||||
std::string const& contents);
|
std::string const& contents);
|
||||||
|
|
||||||
} // namespace xrpl
|
} // namespace xrpl
|
||||||
|
|||||||
@@ -3,8 +3,8 @@
|
|||||||
#include <xrpl/beast/utility/Journal.h>
|
#include <xrpl/beast/utility/Journal.h>
|
||||||
|
|
||||||
#include <boost/beast/core/string.hpp>
|
#include <boost/beast/core/string.hpp>
|
||||||
#include <boost/filesystem.hpp>
|
|
||||||
|
|
||||||
|
#include <filesystem>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
@@ -84,7 +84,7 @@ private:
|
|||||||
* @return `true` if the file was opened.
|
* @return `true` if the file was opened.
|
||||||
*/
|
*/
|
||||||
bool
|
bool
|
||||||
open(boost::filesystem::path const& path);
|
open(std::filesystem::path const& path);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Close and re-open the system file associated with the log
|
* Close and re-open the system file associated with the log
|
||||||
@@ -133,7 +133,7 @@ private:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
std::unique_ptr<std::ofstream> stream_;
|
std::unique_ptr<std::ofstream> stream_;
|
||||||
boost::filesystem::path path_;
|
std::filesystem::path path_;
|
||||||
};
|
};
|
||||||
|
|
||||||
std::mutex mutable mutex_;
|
std::mutex mutable mutex_;
|
||||||
@@ -152,7 +152,7 @@ public:
|
|||||||
virtual ~Logs() = default;
|
virtual ~Logs() = default;
|
||||||
|
|
||||||
bool
|
bool
|
||||||
open(boost::filesystem::path const& pathToLogFile);
|
open(std::filesystem::path const& pathToLogFile);
|
||||||
|
|
||||||
beast::Journal::Sink&
|
beast::Journal::Sink&
|
||||||
get(std::string const& name);
|
get(std::string const& name);
|
||||||
|
|||||||
@@ -6,11 +6,11 @@
|
|||||||
|
|
||||||
#include <xrpl/beast/unit_test/runner.h>
|
#include <xrpl/beast/unit_test/runner.h>
|
||||||
|
|
||||||
#include <boost/filesystem.hpp>
|
|
||||||
#include <boost/lexical_cast.hpp>
|
#include <boost/lexical_cast.hpp>
|
||||||
#include <boost/throw_exception.hpp>
|
#include <boost/throw_exception.hpp>
|
||||||
|
|
||||||
#include <exception>
|
#include <exception>
|
||||||
|
#include <filesystem>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <ostream>
|
#include <ostream>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
@@ -27,7 +27,7 @@ makeReason(String const& reason, char const* file, int line)
|
|||||||
std::string s(reason);
|
std::string s(reason);
|
||||||
if (!s.empty())
|
if (!s.empty())
|
||||||
s.append(": ");
|
s.append(": ");
|
||||||
namespace fs = boost::filesystem;
|
namespace fs = std::filesystem;
|
||||||
s.append(fs::path{file}.filename().string());
|
s.append(fs::path{file}.filename().string());
|
||||||
s.append("(");
|
s.append("(");
|
||||||
s.append(boost::lexical_cast<std::string>(line));
|
s.append(boost::lexical_cast<std::string>(line));
|
||||||
|
|||||||
@@ -1,20 +1,58 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <boost/filesystem.hpp>
|
#include <filesystem>
|
||||||
|
#include <iomanip>
|
||||||
|
#include <random>
|
||||||
|
#include <sstream>
|
||||||
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <system_error>
|
||||||
|
|
||||||
namespace beast {
|
namespace beast {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generate a unique, non-existing path under @p base with an optional @p prefix
|
||||||
|
* and a random hex suffix.
|
||||||
|
*
|
||||||
|
* Attempts up to @p maxAttempts paths. Throws `std::runtime_error` if a
|
||||||
|
* unique path cannot be found or if the filesystem returns an error while
|
||||||
|
* checking for existence.
|
||||||
|
*/
|
||||||
|
inline std::filesystem::path
|
||||||
|
uniqueRandomPath(
|
||||||
|
std::filesystem::path const& base,
|
||||||
|
std::size_t maxAttempts = 100,
|
||||||
|
std::string const& prefix = "")
|
||||||
|
{
|
||||||
|
std::random_device rd;
|
||||||
|
for (std::size_t attempt = 0; attempt < maxAttempts; ++attempt)
|
||||||
|
{
|
||||||
|
std::ostringstream oss;
|
||||||
|
oss << prefix << std::hex << std::setfill('0') << std::setw(8) << rd() << std::setw(8)
|
||||||
|
<< rd();
|
||||||
|
auto candidate = base / oss.str();
|
||||||
|
std::error_code ec;
|
||||||
|
bool const exists = std::filesystem::exists(candidate, ec);
|
||||||
|
if (ec)
|
||||||
|
{
|
||||||
|
throw std::runtime_error(
|
||||||
|
"Unable to check path '" + candidate.string() + "': " + ec.message());
|
||||||
|
}
|
||||||
|
if (!exists)
|
||||||
|
return candidate;
|
||||||
|
}
|
||||||
|
throw std::runtime_error("Unable to generate a unique path under '" + base.string() + "'");
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* RAII temporary directory.
|
* RAII temporary directory.
|
||||||
*
|
*
|
||||||
* The directory and all its contents are deleted when
|
* The directory and all its contents are deleted when
|
||||||
* the instance of `temp_dir` is destroyed.
|
* the instance of `TempDir` is destroyed.
|
||||||
*/
|
*/
|
||||||
class TempDir
|
class TempDir
|
||||||
{
|
{
|
||||||
boost::filesystem::path path_;
|
std::filesystem::path path_;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
#if !GENERATING_DOCS
|
#if !GENERATING_DOCS
|
||||||
@@ -28,12 +66,8 @@ public:
|
|||||||
*/
|
*/
|
||||||
TempDir()
|
TempDir()
|
||||||
{
|
{
|
||||||
auto const dir = boost::filesystem::temp_directory_path();
|
path_ = uniqueRandomPath(std::filesystem::temp_directory_path());
|
||||||
do
|
std::filesystem::create_directory(path_);
|
||||||
{
|
|
||||||
path_ = dir / boost::filesystem::unique_path();
|
|
||||||
} while (boost::filesystem::exists(path_));
|
|
||||||
boost::filesystem::create_directory(path_);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -42,8 +76,8 @@ public:
|
|||||||
~TempDir()
|
~TempDir()
|
||||||
{
|
{
|
||||||
// use non-throwing calls in the destructor
|
// use non-throwing calls in the destructor
|
||||||
boost::system::error_code ec;
|
std::error_code ec;
|
||||||
boost::filesystem::remove_all(path_, ec);
|
std::filesystem::remove_all(path_, ec);
|
||||||
// TODO: warn/notify if ec set ?
|
// TODO: warn/notify if ec set ?
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,10 +4,9 @@
|
|||||||
#include <xrpl/core/Job.h>
|
#include <xrpl/core/Job.h>
|
||||||
#include <xrpl/json/json_value.h>
|
#include <xrpl/json/json_value.h>
|
||||||
|
|
||||||
#include <boost/filesystem.hpp>
|
|
||||||
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
#include <filesystem>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
@@ -44,7 +43,7 @@ public:
|
|||||||
*/
|
*/
|
||||||
struct Setup
|
struct Setup
|
||||||
{
|
{
|
||||||
boost::filesystem::path perfLog;
|
std::filesystem::path perfLog;
|
||||||
// log_interval is in milliseconds to support faster testing.
|
// log_interval is in milliseconds to support faster testing.
|
||||||
milliseconds logInterval{seconds(1)};
|
milliseconds logInterval{seconds(1)};
|
||||||
};
|
};
|
||||||
@@ -149,7 +148,7 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
PerfLog::Setup
|
PerfLog::Setup
|
||||||
setupPerfLog(Section const& section, boost::filesystem::path const& configDir);
|
setupPerfLog(Section const& section, std::filesystem::path const& configDir);
|
||||||
|
|
||||||
std::unique_ptr<PerfLog>
|
std::unique_ptr<PerfLog>
|
||||||
makePerfLog(
|
makePerfLog(
|
||||||
|
|||||||
@@ -6,13 +6,12 @@
|
|||||||
#include <xrpl/core/StartUpType.h>
|
#include <xrpl/core/StartUpType.h>
|
||||||
#include <xrpl/rdb/SociDB.h>
|
#include <xrpl/rdb/SociDB.h>
|
||||||
|
|
||||||
#include <boost/filesystem/path.hpp>
|
|
||||||
|
|
||||||
#include <soci/statement.h>
|
#include <soci/statement.h>
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
#include <filesystem>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
@@ -80,7 +79,7 @@ public:
|
|||||||
|
|
||||||
StartUpType startUp = StartUpType::Normal;
|
StartUpType startUp = StartUpType::Normal;
|
||||||
bool standAlone = false;
|
bool standAlone = false;
|
||||||
boost::filesystem::path dataDir;
|
std::filesystem::path dataDir;
|
||||||
// Indicates whether or not to return the `globalPragma`
|
// Indicates whether or not to return the `globalPragma`
|
||||||
// from commonPragma()
|
// from commonPragma()
|
||||||
bool useGlobalPragma = false;
|
bool useGlobalPragma = false;
|
||||||
@@ -143,7 +142,7 @@ public:
|
|||||||
|
|
||||||
template <std::size_t N, std::size_t M>
|
template <std::size_t N, std::size_t M>
|
||||||
DatabaseCon(
|
DatabaseCon(
|
||||||
boost::filesystem::path const& dataDir,
|
std::filesystem::path const& dataDir,
|
||||||
std::string const& dbName,
|
std::string const& dbName,
|
||||||
std::array<std::string, N> const& pragma,
|
std::array<std::string, N> const& pragma,
|
||||||
std::array<char const*, M> const& initSQL,
|
std::array<char const*, M> const& initSQL,
|
||||||
@@ -155,7 +154,7 @@ public:
|
|||||||
// Use this constructor to setup checkpointing
|
// Use this constructor to setup checkpointing
|
||||||
template <std::size_t N, std::size_t M>
|
template <std::size_t N, std::size_t M>
|
||||||
DatabaseCon(
|
DatabaseCon(
|
||||||
boost::filesystem::path const& dataDir,
|
std::filesystem::path const& dataDir,
|
||||||
std::string const& dbName,
|
std::string const& dbName,
|
||||||
std::array<std::string, N> const& pragma,
|
std::array<std::string, N> const& pragma,
|
||||||
std::array<char const*, M> const& initSQL,
|
std::array<char const*, M> const& initSQL,
|
||||||
@@ -190,7 +189,7 @@ private:
|
|||||||
|
|
||||||
template <std::size_t N, std::size_t M>
|
template <std::size_t N, std::size_t M>
|
||||||
DatabaseCon(
|
DatabaseCon(
|
||||||
boost::filesystem::path const& pPath,
|
std::filesystem::path const& pPath,
|
||||||
std::vector<std::string> const* commonPragma,
|
std::vector<std::string> const* commonPragma,
|
||||||
std::array<std::string, N> const& pragma,
|
std::array<std::string, N> const& pragma,
|
||||||
std::array<char const*, M> const& initSQL,
|
std::array<char const*, M> const& initSQL,
|
||||||
|
|||||||
@@ -14,7 +14,6 @@
|
|||||||
#include <xrpl/protocol/TxMeta.h>
|
#include <xrpl/protocol/TxMeta.h>
|
||||||
#include <xrpl/protocol/TxSearched.h>
|
#include <xrpl/protocol/TxSearched.h>
|
||||||
|
|
||||||
#include <boost/filesystem.hpp>
|
|
||||||
#include <boost/variant.hpp>
|
#include <boost/variant.hpp>
|
||||||
|
|
||||||
#include <concepts>
|
#include <concepts>
|
||||||
|
|||||||
@@ -4,10 +4,9 @@
|
|||||||
#include <xrpl/rdb/DatabaseCon.h>
|
#include <xrpl/rdb/DatabaseCon.h>
|
||||||
#include <xrpl/rdb/SociDB.h>
|
#include <xrpl/rdb/SociDB.h>
|
||||||
|
|
||||||
#include <boost/filesystem.hpp>
|
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
|
||||||
namespace xrpl {
|
namespace xrpl {
|
||||||
|
|
||||||
struct SavedState
|
struct SavedState
|
||||||
|
|||||||
@@ -2,22 +2,20 @@
|
|||||||
|
|
||||||
#include <xrpl/basics/contract.h>
|
#include <xrpl/basics/contract.h>
|
||||||
|
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/filesystem/path.hpp>
|
|
||||||
|
|
||||||
#include <archive.h>
|
#include <archive.h>
|
||||||
#include <archive_entry.h>
|
#include <archive_entry.h>
|
||||||
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
|
#include <filesystem>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
|
||||||
namespace xrpl {
|
namespace xrpl {
|
||||||
|
|
||||||
void
|
void
|
||||||
extractTarLz4(boost::filesystem::path const& src, boost::filesystem::path const& dst)
|
extractTarLz4(std::filesystem::path const& src, std::filesystem::path const& dst)
|
||||||
{
|
{
|
||||||
if (!is_regular_file(src))
|
if (!std::filesystem::is_regular_file(src))
|
||||||
Throw<std::runtime_error>("Invalid source file");
|
Throw<std::runtime_error>("Invalid source file");
|
||||||
|
|
||||||
using archive_ptr = std::unique_ptr<struct archive, void (*)(struct archive*)>;
|
using archive_ptr = std::unique_ptr<struct archive, void (*)(struct archive*)>;
|
||||||
|
|||||||
@@ -1,29 +1,24 @@
|
|||||||
#include <xrpl/basics/FileUtilities.h>
|
#include <xrpl/basics/FileUtilities.h>
|
||||||
|
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/filesystem/path.hpp>
|
|
||||||
#include <boost/system/detail/errc.hpp>
|
|
||||||
#include <boost/system/detail/error_code.hpp>
|
|
||||||
#include <boost/system/errc.hpp>
|
|
||||||
|
|
||||||
#include <cerrno>
|
#include <cerrno>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
|
#include <filesystem>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <ios>
|
#include <ios>
|
||||||
#include <iterator>
|
#include <iterator>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <system_error>
|
||||||
|
|
||||||
namespace xrpl {
|
namespace xrpl {
|
||||||
|
|
||||||
std::string
|
std::string
|
||||||
getFileContents(
|
getFileContents(
|
||||||
boost::system::error_code& ec,
|
std::error_code& ec,
|
||||||
boost::filesystem::path const& sourcePath,
|
std::filesystem::path const& sourcePath,
|
||||||
std::optional<std::size_t> maxSize)
|
std::optional<std::size_t> maxSize)
|
||||||
{
|
{
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
using namespace boost::system::errc;
|
|
||||||
|
|
||||||
path const fullPath{canonical(sourcePath, ec)};
|
path const fullPath{canonical(sourcePath, ec)};
|
||||||
if (ec)
|
if (ec)
|
||||||
@@ -32,15 +27,15 @@ getFileContents(
|
|||||||
if (maxSize && (file_size(fullPath, ec) > *maxSize || ec))
|
if (maxSize && (file_size(fullPath, ec) > *maxSize || ec))
|
||||||
{
|
{
|
||||||
if (!ec)
|
if (!ec)
|
||||||
ec = make_error_code(file_too_large);
|
ec = make_error_code(std::errc::file_too_large);
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
std::ifstream fileStream(fullPath.string(), std::ios::in);
|
std::ifstream fileStream(fullPath, std::ios::in);
|
||||||
|
|
||||||
if (!fileStream)
|
if (!fileStream)
|
||||||
{
|
{
|
||||||
ec = make_error_code(static_cast<errc_t>(errno));
|
ec.assign(errno, std::generic_category());
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,7 +44,7 @@ getFileContents(
|
|||||||
|
|
||||||
if (fileStream.bad())
|
if (fileStream.bad())
|
||||||
{
|
{
|
||||||
ec = make_error_code(static_cast<errc_t>(errno));
|
ec.assign(errno, std::generic_category());
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -58,18 +53,15 @@ getFileContents(
|
|||||||
|
|
||||||
void
|
void
|
||||||
writeFileContents(
|
writeFileContents(
|
||||||
boost::system::error_code& ec,
|
std::error_code& ec,
|
||||||
boost::filesystem::path const& destPath,
|
std::filesystem::path const& destPath,
|
||||||
std::string const& contents)
|
std::string const& contents)
|
||||||
{
|
{
|
||||||
using namespace boost::filesystem;
|
std::ofstream fileStream(destPath, std::ios::out | std::ios::trunc);
|
||||||
using namespace boost::system::errc;
|
|
||||||
|
|
||||||
std::ofstream fileStream(destPath.string(), std::ios::out | std::ios::trunc);
|
|
||||||
|
|
||||||
if (!fileStream)
|
if (!fileStream)
|
||||||
{
|
{
|
||||||
ec = make_error_code(static_cast<errc_t>(errno));
|
ec.assign(errno, std::generic_category());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -77,7 +69,7 @@ writeFileContents(
|
|||||||
|
|
||||||
if (fileStream.bad())
|
if (fileStream.bad())
|
||||||
{
|
{
|
||||||
ec = make_error_code(static_cast<errc_t>(errno));
|
ec.assign(errno, std::generic_category());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,10 +5,10 @@
|
|||||||
#include <xrpl/beast/utility/instrumentation.h>
|
#include <xrpl/beast/utility/instrumentation.h>
|
||||||
|
|
||||||
#include <boost/algorithm/string/predicate.hpp>
|
#include <boost/algorithm/string/predicate.hpp>
|
||||||
#include <boost/filesystem/path.hpp>
|
|
||||||
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
#include <filesystem>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
@@ -54,7 +54,7 @@ Logs::File::isOpen() const noexcept
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
Logs::File::open(boost::filesystem::path const& path)
|
Logs::File::open(std::filesystem::path const& path)
|
||||||
{
|
{
|
||||||
close();
|
close();
|
||||||
|
|
||||||
@@ -114,7 +114,7 @@ Logs::Logs(beast::Severity thresh) : thresh_(thresh) // default severity
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
Logs::open(boost::filesystem::path const& pathToLogFile)
|
Logs::open(std::filesystem::path const& pathToLogFile)
|
||||||
{
|
{
|
||||||
return file_.open(pathToLogFile);
|
return file_.open(pathToLogFile);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,8 +16,6 @@
|
|||||||
#include <xrpl/nodestore/detail/EncodedBlob.h>
|
#include <xrpl/nodestore/detail/EncodedBlob.h>
|
||||||
#include <xrpl/nodestore/detail/codec.h>
|
#include <xrpl/nodestore/detail/codec.h>
|
||||||
|
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/filesystem/path.hpp>
|
|
||||||
#include <boost/system/detail/errc.hpp>
|
#include <boost/system/detail/errc.hpp>
|
||||||
|
|
||||||
#include <nudb/context.hpp>
|
#include <nudb/context.hpp>
|
||||||
@@ -36,12 +34,14 @@
|
|||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#include <exception>
|
#include <exception>
|
||||||
|
#include <filesystem>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <system_error>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
namespace xrpl::NodeStore {
|
namespace xrpl::NodeStore {
|
||||||
@@ -131,7 +131,7 @@ public:
|
|||||||
void
|
void
|
||||||
open(bool createIfMissing, uint64_t appType, uint64_t uid, uint64_t salt) override
|
open(bool createIfMissing, uint64_t appType, uint64_t uid, uint64_t salt) override
|
||||||
{
|
{
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
if (db.is_open())
|
if (db.is_open())
|
||||||
{
|
{
|
||||||
// LCOV_EXCL_START
|
// LCOV_EXCL_START
|
||||||
@@ -194,11 +194,12 @@ public:
|
|||||||
|
|
||||||
if (deletePath)
|
if (deletePath)
|
||||||
{
|
{
|
||||||
boost::filesystem::remove_all(name, ec);
|
std::error_code fsec;
|
||||||
if (ec)
|
std::filesystem::remove_all(name, fsec);
|
||||||
|
if (fsec)
|
||||||
{
|
{
|
||||||
JLOG(j.fatal())
|
JLOG(j.fatal()) << "Filesystem remove_all of " << name
|
||||||
<< "Filesystem remove_all of " << name << " failed with: " << ec.message();
|
<< " failed with: " << fsec.message();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -352,7 +353,7 @@ private:
|
|||||||
static std::size_t
|
static std::size_t
|
||||||
parseBlockSize(std::string const& name, Section const& keyValues, beast::Journal journal)
|
parseBlockSize(std::string const& name, Section const& keyValues, beast::Journal journal)
|
||||||
{
|
{
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
auto const folder = path(name);
|
auto const folder = path(name);
|
||||||
auto const kp = (folder / "nudb.key").string();
|
auto const kp = (folder / "nudb.key").string();
|
||||||
|
|
||||||
|
|||||||
@@ -19,9 +19,6 @@
|
|||||||
#include <xrpl/nodestore/detail/DecodedBlob.h>
|
#include <xrpl/nodestore/detail/DecodedBlob.h>
|
||||||
#include <xrpl/nodestore/detail/EncodedBlob.h>
|
#include <xrpl/nodestore/detail/EncodedBlob.h>
|
||||||
|
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/filesystem/path.hpp>
|
|
||||||
|
|
||||||
#include <rocksdb/advanced_options.h>
|
#include <rocksdb/advanced_options.h>
|
||||||
#include <rocksdb/cache.h>
|
#include <rocksdb/cache.h>
|
||||||
#include <rocksdb/compression_type.h>
|
#include <rocksdb/compression_type.h>
|
||||||
@@ -37,6 +34,7 @@
|
|||||||
|
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
|
#include <filesystem>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
@@ -262,8 +260,8 @@ public:
|
|||||||
db.reset();
|
db.reset();
|
||||||
if (deletePath_)
|
if (deletePath_)
|
||||||
{
|
{
|
||||||
boost::filesystem::path const dir = name;
|
std::filesystem::path const dir = name;
|
||||||
boost::filesystem::remove_all(dir);
|
std::filesystem::remove_all(dir);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,13 +5,11 @@
|
|||||||
#include <xrpl/core/JobQueue.h>
|
#include <xrpl/core/JobQueue.h>
|
||||||
#include <xrpl/core/ServiceRegistry.h>
|
#include <xrpl/core/ServiceRegistry.h>
|
||||||
|
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/filesystem/path.hpp>
|
|
||||||
|
|
||||||
#include <soci/blob.h>
|
#include <soci/blob.h>
|
||||||
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
#include <filesystem>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
@@ -45,8 +43,8 @@ getSociSqliteInit(std::string const& name, std::string const& dir, std::string c
|
|||||||
Throw<std::runtime_error>(
|
Throw<std::runtime_error>(
|
||||||
"Sqlite databases must specify a dir and a name. Name: " + name + " Dir: " + dir);
|
"Sqlite databases must specify a dir and a name. Name: " + name + " Dir: " + dir);
|
||||||
}
|
}
|
||||||
boost::filesystem::path file(dir);
|
std::filesystem::path file(dir);
|
||||||
if (is_directory(file))
|
if (std::filesystem::is_directory(file))
|
||||||
file /= name + ext;
|
file /= name + ext;
|
||||||
return file.string();
|
return file.string();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,13 +5,12 @@
|
|||||||
#include <xrpl/rdb/DBInit.h>
|
#include <xrpl/rdb/DBInit.h>
|
||||||
#include <xrpl/rdb/DatabaseCon.h>
|
#include <xrpl/rdb/DatabaseCon.h>
|
||||||
|
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/filesystem/path.hpp>
|
|
||||||
#include <boost/format.hpp> // IWYU pragma: keep
|
#include <boost/format.hpp> // IWYU pragma: keep
|
||||||
|
|
||||||
#include <soci/into.h>
|
#include <soci/into.h>
|
||||||
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
#include <filesystem>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
@@ -20,12 +19,12 @@ namespace xrpl {
|
|||||||
bool
|
bool
|
||||||
doVacuumDB(DatabaseCon::Setup const& setup, beast::Journal j)
|
doVacuumDB(DatabaseCon::Setup const& setup, beast::Journal j)
|
||||||
{
|
{
|
||||||
boost::filesystem::path const dbPath = setup.dataDir / kTxDbName;
|
std::filesystem::path const dbPath = setup.dataDir / kTxDbName;
|
||||||
|
|
||||||
uintmax_t const dbSize = file_size(dbPath);
|
uintmax_t const dbSize = std::filesystem::file_size(dbPath);
|
||||||
XRPL_ASSERT(dbSize != static_cast<uintmax_t>(-1), "xrpl::doVacuumDB : file_size succeeded");
|
XRPL_ASSERT(dbSize != static_cast<uintmax_t>(-1), "xrpl::doVacuumDB : file_size succeeded");
|
||||||
|
|
||||||
if (auto available = space(dbPath.parent_path()).available; available < dbSize)
|
if (auto available = std::filesystem::space(dbPath.parent_path()).available; available < dbSize)
|
||||||
{
|
{
|
||||||
std::cerr << "The database filesystem must have at least as "
|
std::cerr << "The database filesystem must have at least as "
|
||||||
"much free space as the size of "
|
"much free space as the size of "
|
||||||
|
|||||||
@@ -2,12 +2,11 @@
|
|||||||
#include <test/jtx/envconfig.h>
|
#include <test/jtx/envconfig.h>
|
||||||
|
|
||||||
#include <xrpl/beast/unit_test/suite.h>
|
#include <xrpl/beast/unit_test/suite.h>
|
||||||
|
#include <xrpl/beast/utility/temp_dir.h>
|
||||||
#include <xrpl/config/Constants.h>
|
#include <xrpl/config/Constants.h>
|
||||||
#include <xrpl/proto/org/xrpl/rpc/v1/get_ledger.pb.h>
|
#include <xrpl/proto/org/xrpl/rpc/v1/get_ledger.pb.h>
|
||||||
#include <xrpl/proto/org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h>
|
#include <xrpl/proto/org/xrpl/rpc/v1/xrp_ledger.grpc.pb.h>
|
||||||
|
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
|
|
||||||
#include <grpcpp/client_context.h>
|
#include <grpcpp/client_context.h>
|
||||||
#include <grpcpp/create_channel.h>
|
#include <grpcpp/create_channel.h>
|
||||||
#include <grpcpp/grpcpp.h>
|
#include <grpcpp/grpcpp.h>
|
||||||
@@ -17,6 +16,7 @@
|
|||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
#include <ios>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
@@ -254,10 +254,8 @@ public:
|
|||||||
|
|
||||||
TemporaryTLSCertificates()
|
TemporaryTLSCertificates()
|
||||||
{
|
{
|
||||||
auto tmpDir = std::filesystem::temp_directory_path();
|
tempDir_ = beast::uniqueRandomPath(
|
||||||
auto uniqueDirName =
|
std::filesystem::temp_directory_path(), 100, std::string(kCertsDirPrefix));
|
||||||
boost::filesystem::unique_path(std::string(kCertsDirPrefix) + "%%%%%%%%");
|
|
||||||
tempDir_ = tmpDir / uniqueDirName.string();
|
|
||||||
std::filesystem::create_directories(tempDir_);
|
std::filesystem::create_directories(tempDir_);
|
||||||
|
|
||||||
writeFile(tempDir_ / kCaCertFilename, kCaCertContent);
|
writeFile(tempDir_ / kCaCertFilename, kCaCertContent);
|
||||||
|
|||||||
@@ -18,16 +18,16 @@
|
|||||||
#include <xrpl/protocol/jss.h>
|
#include <xrpl/protocol/jss.h>
|
||||||
|
|
||||||
#include <boost/algorithm/string/erase.hpp>
|
#include <boost/algorithm/string/erase.hpp>
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/system/detail/error_code.hpp>
|
|
||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
#include <filesystem>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <ios>
|
#include <ios>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <system_error>
|
||||||
|
|
||||||
namespace xrpl {
|
namespace xrpl {
|
||||||
|
|
||||||
@@ -139,7 +139,7 @@ class LedgerLoad_test : public beast::unit_test::Suite
|
|||||||
{
|
{
|
||||||
testcase("Load ledger: Bad Files");
|
testcase("Load ledger: Bad Files");
|
||||||
using namespace test::jtx;
|
using namespace test::jtx;
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
|
|
||||||
// empty path
|
// empty path
|
||||||
except([&] {
|
except([&] {
|
||||||
@@ -161,8 +161,8 @@ class LedgerLoad_test : public beast::unit_test::Suite
|
|||||||
});
|
});
|
||||||
|
|
||||||
// make a corrupted version of the ledger file (last 10 bytes removed).
|
// make a corrupted version of the ledger file (last 10 bytes removed).
|
||||||
boost::system::error_code ec;
|
std::error_code ec;
|
||||||
auto ledgerFileCorrupt = boost::filesystem::path{sd.dbPath} / "ledgerdata_bad.json";
|
auto ledgerFileCorrupt = std::filesystem::path{sd.dbPath} / "ledgerdata_bad.json";
|
||||||
copy_file(sd.ledgerFile, ledgerFileCorrupt, copy_options::overwrite_existing, ec);
|
copy_file(sd.ledgerFile, ledgerFileCorrupt, copy_options::overwrite_existing, ec);
|
||||||
if (!BEAST_EXPECTS(!ec, ec.message()))
|
if (!BEAST_EXPECTS(!ec, ec.message()))
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -22,14 +22,12 @@
|
|||||||
#include <xrpl/server/Manifest.h>
|
#include <xrpl/server/Manifest.h>
|
||||||
#include <xrpl/server/Wallet.h>
|
#include <xrpl/server/Wallet.h>
|
||||||
|
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/filesystem/path.hpp>
|
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <exception>
|
#include <exception>
|
||||||
|
#include <filesystem>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
@@ -56,18 +54,18 @@ private:
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
cleanupDatabaseDir(boost::filesystem::path const& dbPath)
|
cleanupDatabaseDir(std::filesystem::path const& dbPath)
|
||||||
{
|
{
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
if (!exists(dbPath) || !is_directory(dbPath) || !is_empty(dbPath))
|
if (!exists(dbPath) || !is_directory(dbPath) || !is_empty(dbPath))
|
||||||
return;
|
return;
|
||||||
remove(dbPath);
|
remove(dbPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
setupDatabaseDir(boost::filesystem::path const& dbPath)
|
setupDatabaseDir(std::filesystem::path const& dbPath)
|
||||||
{
|
{
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
if (!exists(dbPath))
|
if (!exists(dbPath))
|
||||||
{
|
{
|
||||||
create_directory(dbPath);
|
create_directory(dbPath);
|
||||||
@@ -80,10 +78,10 @@ private:
|
|||||||
Throw<std::runtime_error>("Cannot create directory: " + dbPath.string());
|
Throw<std::runtime_error>("Cannot create directory: " + dbPath.string());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
static boost::filesystem::path
|
static std::filesystem::path
|
||||||
getDatabasePath()
|
getDatabasePath()
|
||||||
{
|
{
|
||||||
return boost::filesystem::current_path() / "manifest_test_databases";
|
return std::filesystem::current_path() / "manifest_test_databases";
|
||||||
}
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
@@ -351,7 +349,7 @@ public:
|
|||||||
BEAST_EXPECT(loaded.revoked(pk));
|
BEAST_EXPECT(loaded.revoked(pk));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
boost::filesystem::remove(getDatabasePath() / boost::filesystem::path(dbName));
|
std::filesystem::remove(getDatabasePath() / std::filesystem::path(dbName));
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|||||||
@@ -23,10 +23,9 @@
|
|||||||
#include <xrpl/protocol/XRPAmount.h>
|
#include <xrpl/protocol/XRPAmount.h>
|
||||||
#include <xrpl/protocol/jss.h>
|
#include <xrpl/protocol/jss.h>
|
||||||
|
|
||||||
#include <boost/filesystem/path.hpp>
|
|
||||||
|
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
#include <filesystem>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
@@ -493,7 +492,7 @@ public:
|
|||||||
makeBackendRotating(jtx::Env& env, NodeStoreScheduler& scheduler, std::string path)
|
makeBackendRotating(jtx::Env& env, NodeStoreScheduler& scheduler, std::string path)
|
||||||
{
|
{
|
||||||
Section section{env.app().config().section(Sections::kNodeDatabase)};
|
Section section{env.app().config().section(Sections::kNodeDatabase)};
|
||||||
boost::filesystem::path newPath;
|
std::filesystem::path newPath;
|
||||||
|
|
||||||
if (!BEAST_EXPECT(path.size()))
|
if (!BEAST_EXPECT(path.size()))
|
||||||
return {};
|
return {};
|
||||||
|
|||||||
@@ -15,13 +15,12 @@
|
|||||||
#include <xrpl/protocol/jss.h>
|
#include <xrpl/protocol/jss.h>
|
||||||
|
|
||||||
#include <boost/algorithm/string/join.hpp>
|
#include <boost/algorithm/string/join.hpp>
|
||||||
#include <boost/filesystem/directory.hpp>
|
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/range/adaptor/transformed.hpp>
|
#include <boost/range/adaptor/transformed.hpp>
|
||||||
|
|
||||||
#include <date/date.h>
|
#include <date/date.h>
|
||||||
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
|
#include <filesystem>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <ostream>
|
#include <ostream>
|
||||||
@@ -704,7 +703,7 @@ public:
|
|||||||
.effectiveOverlap = detail::kDefaultEffectiveOverlap,
|
.effectiveOverlap = detail::kDefaultEffectiveOverlap,
|
||||||
.expectedRefreshMin = 60 * 24}}); // max of 24 hours
|
.expectedRefreshMin = 60 * 24}}); // max of 24 hours
|
||||||
}
|
}
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
for (auto const& file : directory_iterator(good.subdir()))
|
for (auto const& file : directory_iterator(good.subdir()))
|
||||||
{
|
{
|
||||||
remove_all(file);
|
remove_all(file);
|
||||||
|
|||||||
@@ -15,14 +15,10 @@
|
|||||||
#include <xrpl/protocol/ErrorCodes.h>
|
#include <xrpl/protocol/ErrorCodes.h>
|
||||||
#include <xrpl/protocol/jss.h>
|
#include <xrpl/protocol/jss.h>
|
||||||
|
|
||||||
#include <boost/filesystem/file_status.hpp>
|
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/filesystem/path.hpp>
|
|
||||||
#include <boost/system/detail/error_code.hpp>
|
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
#include <filesystem>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <ios>
|
#include <ios>
|
||||||
#include <iterator>
|
#include <iterator>
|
||||||
@@ -31,6 +27,7 @@
|
|||||||
#include <ostream>
|
#include <ostream>
|
||||||
#include <random>
|
#include <random>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <system_error>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
@@ -43,7 +40,7 @@ class PerfLog_test : public beast::unit_test::Suite
|
|||||||
{
|
{
|
||||||
enum class WithFile : bool { No = false, Yes = true };
|
enum class WithFile : bool { No = false, Yes = true };
|
||||||
|
|
||||||
using path = boost::filesystem::path;
|
using path = std::filesystem::path;
|
||||||
|
|
||||||
// We're only using Env for its Journal. That Journal gives better
|
// We're only using Env for its Journal. That Journal gives better
|
||||||
// coverage in unit tests.
|
// coverage in unit tests.
|
||||||
@@ -66,14 +63,14 @@ class PerfLog_test : public beast::unit_test::Suite
|
|||||||
// The error code is intentionally ignored: if the path doesn't
|
// The error code is intentionally ignored: if the path doesn't
|
||||||
// exist (the common case on a clean runner) remove_all returns
|
// exist (the common case on a clean runner) remove_all returns
|
||||||
// an error, and that's fine — there's nothing to clean up.
|
// an error, and that's fine — there's nothing to clean up.
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
boost::system::error_code ec;
|
std::error_code ec;
|
||||||
remove_all(logDir(), ec);
|
remove_all(logDir(), ec);
|
||||||
}
|
}
|
||||||
|
|
||||||
~Fixture()
|
~Fixture()
|
||||||
{
|
{
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
|
|
||||||
auto const dir{logDir()};
|
auto const dir{logDir()};
|
||||||
auto const file{logFile()};
|
auto const file{logFile()};
|
||||||
@@ -96,7 +93,7 @@ class PerfLog_test : public beast::unit_test::Suite
|
|||||||
static path
|
static path
|
||||||
logDir()
|
logDir()
|
||||||
{
|
{
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
return temp_directory_path() / "perf_log_test_dir";
|
return temp_directory_path() / "perf_log_test_dir";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -129,7 +126,7 @@ class PerfLog_test : public beast::unit_test::Suite
|
|||||||
static void
|
static void
|
||||||
wait()
|
wait()
|
||||||
{
|
{
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
|
|
||||||
auto const path = logFile();
|
auto const path = logFile();
|
||||||
if (!exists(path))
|
if (!exists(path))
|
||||||
@@ -201,7 +198,7 @@ public:
|
|||||||
void
|
void
|
||||||
testFileCreation()
|
testFileCreation()
|
||||||
{
|
{
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
|
|
||||||
{
|
{
|
||||||
// Verify a PerfLog creates its file when constructed.
|
// Verify a PerfLog creates its file when constructed.
|
||||||
@@ -256,22 +253,23 @@ public:
|
|||||||
|
|
||||||
// Construct and write protect a file to prevent PerfLog
|
// Construct and write protect a file to prevent PerfLog
|
||||||
// from creating its file.
|
// from creating its file.
|
||||||
boost::system::error_code ec;
|
std::error_code ec;
|
||||||
boost::filesystem::create_directories(fixture.logDir(), ec);
|
std::filesystem::create_directories(fixture.logDir(), ec);
|
||||||
if (!BEAST_EXPECT(!ec))
|
if (!BEAST_EXPECT(!ec))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
auto fileWriteable = [](boost::filesystem::path const& p) -> bool {
|
auto fileWriteable = [](std::filesystem::path const& p) -> bool {
|
||||||
return std::ofstream{p.c_str(), std::ios::out | std::ios::app}.is_open();
|
return std::ofstream{p, std::ios::out | std::ios::app}.is_open();
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!BEAST_EXPECT(fileWriteable(fixture.logFile())))
|
if (!BEAST_EXPECT(fileWriteable(fixture.logFile())))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
boost::filesystem::permissions(
|
std::filesystem::permissions(
|
||||||
fixture.logFile(),
|
fixture.logFile(),
|
||||||
perms::remove_perms | perms::owner_write | perms::others_write |
|
std::filesystem::perms::owner_write | std::filesystem::perms::others_write |
|
||||||
perms::group_write);
|
std::filesystem::perms::group_write,
|
||||||
|
std::filesystem::perm_options::remove);
|
||||||
|
|
||||||
// If the test is running as root, then the write protect may have
|
// If the test is running as root, then the write protect may have
|
||||||
// no effect. Make sure write protect worked before proceeding.
|
// no effect. Make sure write protect worked before proceeding.
|
||||||
@@ -295,9 +293,11 @@ public:
|
|||||||
perfLog->stop();
|
perfLog->stop();
|
||||||
|
|
||||||
// Fix file permissions so the file can be cleaned up.
|
// Fix file permissions so the file can be cleaned up.
|
||||||
boost::filesystem::permissions(
|
std::filesystem::permissions(
|
||||||
fixture.logFile(),
|
fixture.logFile(),
|
||||||
perms::add_perms | perms::owner_write | perms::others_write | perms::group_write);
|
std::filesystem::perms::owner_write | std::filesystem::perms::others_write |
|
||||||
|
std::filesystem::perms::group_write,
|
||||||
|
std::filesystem::perm_options::add);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -962,7 +962,7 @@ public:
|
|||||||
// We can't fully test rotate because unit tests must run on Windows,
|
// We can't fully test rotate because unit tests must run on Windows,
|
||||||
// and Windows doesn't (may not?) support rotate. But at least call
|
// and Windows doesn't (may not?) support rotate. But at least call
|
||||||
// the interface and see that it doesn't crash.
|
// the interface and see that it doesn't crash.
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
|
|
||||||
Fixture fixture{env_.app(), j_};
|
Fixture fixture{env_.app(), j_};
|
||||||
BEAST_EXPECT(!exists(fixture.logDir()));
|
BEAST_EXPECT(!exists(fixture.logDir()));
|
||||||
|
|||||||
@@ -10,7 +10,6 @@
|
|||||||
#include <xrpl/protocol/SystemParameters.h> // IWYU pragma: keep
|
#include <xrpl/protocol/SystemParameters.h> // IWYU pragma: keep
|
||||||
#include <xrpl/server/Port.h>
|
#include <xrpl/server/Port.h>
|
||||||
|
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/format.hpp> // IWYU pragma: keep
|
#include <boost/format.hpp> // IWYU pragma: keep
|
||||||
#include <boost/format/free_funcs.hpp>
|
#include <boost/format/free_funcs.hpp>
|
||||||
#include <boost/lexical_cast/bad_lexical_cast.hpp>
|
#include <boost/lexical_cast/bad_lexical_cast.hpp>
|
||||||
@@ -20,6 +19,7 @@
|
|||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <exception>
|
#include <exception>
|
||||||
|
#include <filesystem>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
#include <ostream>
|
#include <ostream>
|
||||||
@@ -179,7 +179,7 @@ public:
|
|||||||
[[nodiscard]] bool
|
[[nodiscard]] bool
|
||||||
dataDirExists() const
|
dataDirExists() const
|
||||||
{
|
{
|
||||||
return boost::filesystem::is_directory(dataDir_);
|
return std::filesystem::is_directory(dataDir_);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]] bool
|
[[nodiscard]] bool
|
||||||
@@ -192,7 +192,7 @@ public:
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
if (rmDataDir_)
|
if (rmDataDir_)
|
||||||
rmDir(dataDir_);
|
rmDir(dataDir_);
|
||||||
}
|
}
|
||||||
@@ -273,7 +273,7 @@ public:
|
|||||||
class Config_test final : public TestSuite
|
class Config_test final : public TestSuite
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
using path = boost::filesystem::path;
|
using path = std::filesystem::path;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
void
|
void
|
||||||
@@ -309,7 +309,7 @@ port_wss_admin
|
|||||||
{
|
{
|
||||||
testcase("config_file");
|
testcase("config_file");
|
||||||
|
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
auto const cwd = current_path();
|
auto const cwd = current_path();
|
||||||
|
|
||||||
// Test both config file names.
|
// Test both config file names.
|
||||||
@@ -425,7 +425,7 @@ port_wss_admin
|
|||||||
{
|
{
|
||||||
testcase("database_path");
|
testcase("database_path");
|
||||||
|
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
{
|
{
|
||||||
boost::format cc("[database_path]\n%1%\n");
|
boost::format cc("[database_path]\n%1%\n");
|
||||||
|
|
||||||
@@ -601,7 +601,7 @@ main
|
|||||||
{
|
{
|
||||||
testcase("validators_file");
|
testcase("validators_file");
|
||||||
|
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
{
|
{
|
||||||
// load should throw for missing specified validators file
|
// load should throw for missing specified validators file
|
||||||
boost::format cc("[validators_file]\n%1%\n");
|
boost::format cc("[validators_file]\n%1%\n");
|
||||||
|
|||||||
@@ -7,8 +7,6 @@
|
|||||||
#include <xrpl/rdb/SociDB.h>
|
#include <xrpl/rdb/SociDB.h>
|
||||||
|
|
||||||
#include <boost/algorithm/string/predicate.hpp>
|
#include <boost/algorithm/string/predicate.hpp>
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/filesystem/path.hpp>
|
|
||||||
#include <boost/optional/optional.hpp> // IWYU pragma: keep
|
#include <boost/optional/optional.hpp> // IWYU pragma: keep
|
||||||
|
|
||||||
#include <soci/boost-optional.h> // IWYU pragma: keep
|
#include <soci/boost-optional.h> // IWYU pragma: keep
|
||||||
@@ -20,6 +18,7 @@
|
|||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <exception>
|
#include <exception>
|
||||||
|
#include <filesystem>
|
||||||
#include <iterator>
|
#include <iterator>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
@@ -32,7 +31,7 @@ class SociDB_test final : public TestSuite
|
|||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
static void
|
static void
|
||||||
setupSQLiteConfig(BasicConfig& config, boost::filesystem::path const& dbPath)
|
setupSQLiteConfig(BasicConfig& config, std::filesystem::path const& dbPath)
|
||||||
{
|
{
|
||||||
config.overwrite(Sections::kSqdb, Keys::kBackend, "sqlite");
|
config.overwrite(Sections::kSqdb, Keys::kBackend, "sqlite");
|
||||||
auto value = dbPath.string();
|
auto value = dbPath.string();
|
||||||
@@ -41,18 +40,18 @@ private:
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
cleanupDatabaseDir(boost::filesystem::path const& dbPath)
|
cleanupDatabaseDir(std::filesystem::path const& dbPath)
|
||||||
{
|
{
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
if (!exists(dbPath) || !is_directory(dbPath) || !is_empty(dbPath))
|
if (!exists(dbPath) || !is_directory(dbPath) || !is_empty(dbPath))
|
||||||
return;
|
return;
|
||||||
remove(dbPath);
|
remove(dbPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
setupDatabaseDir(boost::filesystem::path const& dbPath)
|
setupDatabaseDir(std::filesystem::path const& dbPath)
|
||||||
{
|
{
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
if (!exists(dbPath))
|
if (!exists(dbPath))
|
||||||
{
|
{
|
||||||
create_directory(dbPath);
|
create_directory(dbPath);
|
||||||
@@ -65,10 +64,10 @@ private:
|
|||||||
Throw<std::runtime_error>("Cannot create directory: " + dbPath.string());
|
Throw<std::runtime_error>("Cannot create directory: " + dbPath.string());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
static boost::filesystem::path
|
static std::filesystem::path
|
||||||
getDatabasePath()
|
getDatabasePath()
|
||||||
{
|
{
|
||||||
return boost::filesystem::current_path() / "socidb_test_databases";
|
return std::filesystem::current_path() / "socidb_test_databases";
|
||||||
}
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
@@ -158,7 +157,7 @@ public:
|
|||||||
checkValues(s);
|
checkValues(s);
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
namespace bfs = boost::filesystem;
|
namespace bfs = std::filesystem;
|
||||||
// Remove the database
|
// Remove the database
|
||||||
bfs::path const dbPath(sc.connectionString());
|
bfs::path const dbPath(sc.connectionString());
|
||||||
if (bfs::is_regular_file(dbPath))
|
if (bfs::is_regular_file(dbPath))
|
||||||
@@ -288,7 +287,7 @@ public:
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
namespace bfs = boost::filesystem;
|
namespace bfs = std::filesystem;
|
||||||
// Remove the database
|
// Remove the database
|
||||||
bfs::path const dbPath(sc.connectionString());
|
bfs::path const dbPath(sc.connectionString());
|
||||||
if (bfs::is_regular_file(dbPath))
|
if (bfs::is_regular_file(dbPath))
|
||||||
@@ -340,7 +339,7 @@ public:
|
|||||||
s << "SELECT LedgerSeq FROM Ledgers;", soci::into(ledgersLS);
|
s << "SELECT LedgerSeq FROM Ledgers;", soci::into(ledgersLS);
|
||||||
BEAST_EXPECT(ledgersLS.size() == numRows);
|
BEAST_EXPECT(ledgersLS.size() == numRows);
|
||||||
}
|
}
|
||||||
namespace bfs = boost::filesystem;
|
namespace bfs = std::filesystem;
|
||||||
// Remove the database
|
// Remove the database
|
||||||
bfs::path const dbPath(sc.connectionString());
|
bfs::path const dbPath(sc.connectionString());
|
||||||
if (bfs::is_regular_file(dbPath))
|
if (bfs::is_regular_file(dbPath))
|
||||||
|
|||||||
@@ -3,9 +3,8 @@
|
|||||||
#include <xrpl/basics/contract.h>
|
#include <xrpl/basics/contract.h>
|
||||||
#include <xrpl/beast/unit_test/suite.h>
|
#include <xrpl/beast/unit_test/suite.h>
|
||||||
|
|
||||||
#include <boost/filesystem.hpp>
|
|
||||||
|
|
||||||
#include <exception>
|
#include <exception>
|
||||||
|
#include <filesystem>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <ostream>
|
#include <ostream>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
@@ -20,7 +19,7 @@ namespace xrpl::detail {
|
|||||||
class DirGuard
|
class DirGuard
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
using path = boost::filesystem::path;
|
using path = std::filesystem::path;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
path subDir_;
|
path subDir_;
|
||||||
@@ -47,7 +46,7 @@ public:
|
|||||||
DirGuard(beast::unit_test::Suite& test, path subDir, bool useCounter = true)
|
DirGuard(beast::unit_test::Suite& test, path subDir, bool useCounter = true)
|
||||||
: subDir_(std::move(subDir)), test_(test)
|
: subDir_(std::move(subDir)), test_(test)
|
||||||
{
|
{
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
|
|
||||||
static auto kSubDirCounter = 0;
|
static auto kSubDirCounter = 0;
|
||||||
if (useCounter)
|
if (useCounter)
|
||||||
@@ -73,7 +72,7 @@ public:
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
|
|
||||||
if (rmSubDir_)
|
if (rmSubDir_)
|
||||||
rmDir(subDir_);
|
rmDir(subDir_);
|
||||||
@@ -130,7 +129,7 @@ public:
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
if (exists(file_))
|
if (exists(file_))
|
||||||
{
|
{
|
||||||
remove(file_);
|
remove(file_);
|
||||||
@@ -160,7 +159,7 @@ public:
|
|||||||
[[nodiscard]] bool
|
[[nodiscard]] bool
|
||||||
fileExists() const
|
fileExists() const
|
||||||
{
|
{
|
||||||
return boost::filesystem::exists(file_);
|
return std::filesystem::exists(file_);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,17 +1,16 @@
|
|||||||
#include <xrpl/basics/FileUtilities.h>
|
#include <xrpl/basics/FileUtilities.h>
|
||||||
|
|
||||||
#include <xrpl/basics/ByteUtilities.h>
|
#include <xrpl/basics/ByteUtilities.h>
|
||||||
|
#include <xrpl/beast/utility/temp_dir.h>
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/filesystem/path.hpp>
|
|
||||||
#include <boost/system/detail/errc.hpp>
|
|
||||||
#include <boost/system/detail/error_code.hpp>
|
|
||||||
|
|
||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
|
|
||||||
|
#include <cerrno>
|
||||||
|
#include <filesystem>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <system_error>
|
||||||
|
|
||||||
namespace xrpl {
|
namespace xrpl {
|
||||||
|
|
||||||
@@ -20,15 +19,16 @@ namespace {
|
|||||||
class TempFile
|
class TempFile
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit TempFile(boost::filesystem::path file, std::string const& contents)
|
explicit TempFile(std::filesystem::path file, std::string const& contents)
|
||||||
: dir_(
|
: dir_(beast::uniqueRandomPath(
|
||||||
boost::filesystem::temp_directory_path() /
|
std::filesystem::temp_directory_path(),
|
||||||
boost::filesystem::unique_path("xrpl-file-utilities-%%%%-%%%%-%%%%"))
|
100,
|
||||||
|
"xrpl-file-utilities-"))
|
||||||
, file_(dir_ / file)
|
, file_(dir_ / file)
|
||||||
{
|
{
|
||||||
boost::filesystem::create_directory(dir_);
|
std::filesystem::create_directory(dir_);
|
||||||
|
|
||||||
std::ofstream output(file_.string());
|
std::ofstream output(file_);
|
||||||
if (!output)
|
if (!output)
|
||||||
throw std::runtime_error("Unable to create temporary test file");
|
throw std::runtime_error("Unable to create temporary test file");
|
||||||
|
|
||||||
@@ -37,33 +37,31 @@ public:
|
|||||||
|
|
||||||
~TempFile()
|
~TempFile()
|
||||||
{
|
{
|
||||||
boost::system::error_code ec;
|
std::error_code ec;
|
||||||
boost::filesystem::remove(file_, ec);
|
std::filesystem::remove(file_, ec);
|
||||||
boost::filesystem::remove(dir_, ec);
|
std::filesystem::remove(dir_, ec);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]] boost::filesystem::path const&
|
[[nodiscard]] std::filesystem::path const&
|
||||||
file() const
|
file() const
|
||||||
{
|
{
|
||||||
return file_;
|
return file_;
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
boost::filesystem::path dir_;
|
std::filesystem::path dir_;
|
||||||
boost::filesystem::path file_;
|
std::filesystem::path file_;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
TEST(FileUtilitiesTest, get_file_contents)
|
TEST(FileUtilitiesTest, get_file_contents)
|
||||||
{
|
{
|
||||||
using namespace boost::system;
|
|
||||||
|
|
||||||
constexpr char const* kExpectedContents = "This file is very short. That's all we need.";
|
constexpr char const* kExpectedContents = "This file is very short. That's all we need.";
|
||||||
|
|
||||||
TempFile const file("test_file", "This is temporary text that should get overwritten");
|
TempFile const file("test_file", "This is temporary text that should get overwritten");
|
||||||
|
|
||||||
error_code ec;
|
std::error_code ec;
|
||||||
auto const path = file.file();
|
auto const path = file.file();
|
||||||
|
|
||||||
writeFileContents(ec, path, kExpectedContents);
|
writeFileContents(ec, path, kExpectedContents);
|
||||||
@@ -86,7 +84,7 @@ TEST(FileUtilitiesTest, get_file_contents)
|
|||||||
{
|
{
|
||||||
// Test with small max
|
// Test with small max
|
||||||
auto const bad = getFileContents(ec, path, 16);
|
auto const bad = getFileContents(ec, path, 16);
|
||||||
EXPECT_TRUE(ec && ec.value() == boost::system::errc::file_too_large);
|
EXPECT_TRUE(ec && ec.value() == static_cast<int>(std::errc::file_too_large));
|
||||||
EXPECT_TRUE(bad.empty());
|
EXPECT_TRUE(bad.empty());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,6 +49,7 @@
|
|||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <system_error>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
@@ -615,7 +616,7 @@ GRPCServerImpl::createServerCredentials()
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
boost::system::error_code ec;
|
std::error_code ec;
|
||||||
grpc::SslServerCredentialsOptions sslOpts;
|
grpc::SslServerCredentialsOptions sslOpts;
|
||||||
grpc::SslServerCredentialsOptions::PemKeyCertPair keyCertPair;
|
grpc::SslServerCredentialsOptions::PemKeyCertPair keyCertPair;
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
#include <xrpl/beast/core/CurrentThreadName.h>
|
#include <xrpl/beast/core/CurrentThreadName.h>
|
||||||
#include <xrpl/beast/utility/Journal.h>
|
#include <xrpl/beast/utility/Journal.h>
|
||||||
#include <xrpl/beast/utility/instrumentation.h>
|
#include <xrpl/beast/utility/instrumentation.h>
|
||||||
|
#include <xrpl/beast/utility/temp_dir.h>
|
||||||
#include <xrpl/config/BasicConfig.h>
|
#include <xrpl/config/BasicConfig.h>
|
||||||
#include <xrpl/config/Constants.h>
|
#include <xrpl/config/Constants.h>
|
||||||
#include <xrpl/ledger/Ledger.h>
|
#include <xrpl/ledger/Ledger.h>
|
||||||
@@ -25,13 +26,12 @@
|
|||||||
#include <xrpl/shamap/SHAMapTreeNode.h>
|
#include <xrpl/shamap/SHAMapTreeNode.h>
|
||||||
|
|
||||||
#include <boost/algorithm/string/predicate.hpp>
|
#include <boost/algorithm/string/predicate.hpp>
|
||||||
#include <boost/filesystem/directory.hpp>
|
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/filesystem/path.hpp>
|
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
#include <filesystem>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
|
#include <ios>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
@@ -391,10 +391,10 @@ SHAMapStoreImp::dbPaths()
|
|||||||
if (boost::iequals(get(section, Keys::kType), "memory"))
|
if (boost::iequals(get(section, Keys::kType), "memory"))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
boost::filesystem::path dbPath = get(section, Keys::kPath);
|
std::filesystem::path dbPath = get(section, Keys::kPath);
|
||||||
if (boost::filesystem::exists(dbPath))
|
if (std::filesystem::exists(dbPath))
|
||||||
{
|
{
|
||||||
if (!boost::filesystem::is_directory(dbPath))
|
if (!std::filesystem::is_directory(dbPath))
|
||||||
{
|
{
|
||||||
journal_.error() << "node db path must be a directory. " << dbPath.string();
|
journal_.error() << "node db path must be a directory. " << dbPath.string();
|
||||||
Throw<std::runtime_error>("node db path must be a directory.");
|
Throw<std::runtime_error>("node db path must be a directory.");
|
||||||
@@ -402,7 +402,7 @@ SHAMapStoreImp::dbPaths()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
boost::filesystem::create_directories(dbPath);
|
std::filesystem::create_directories(dbPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
SavedState state = stateDb_.getState();
|
SavedState state = stateDb_.getState();
|
||||||
@@ -413,8 +413,8 @@ SHAMapStoreImp::dbPaths()
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
// Check if configured "path" matches stored directory path
|
// Check if configured "path" matches stored directory path
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
auto const stored{path(sPath)};
|
auto const stored{std::filesystem::path(sPath)};
|
||||||
if (stored.parent_path() == dbPath)
|
if (stored.parent_path() == dbPath)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@@ -432,9 +432,9 @@ SHAMapStoreImp::dbPaths()
|
|||||||
bool writableDbExists = false;
|
bool writableDbExists = false;
|
||||||
bool archiveDbExists = false;
|
bool archiveDbExists = false;
|
||||||
|
|
||||||
std::vector<boost::filesystem::path> pathsToDelete;
|
std::vector<std::filesystem::path> pathsToDelete;
|
||||||
for (boost::filesystem::directory_iterator it(dbPath);
|
for (std::filesystem::directory_iterator it(dbPath);
|
||||||
it != boost::filesystem::directory_iterator();
|
it != std::filesystem::directory_iterator();
|
||||||
++it)
|
++it)
|
||||||
{
|
{
|
||||||
if (state.writableDb.compare(it->path().string()) == 0)
|
if (state.writableDb.compare(it->path().string()) == 0)
|
||||||
@@ -455,7 +455,7 @@ SHAMapStoreImp::dbPaths()
|
|||||||
(!archiveDbExists && !state.archiveDb.empty()) || (writableDbExists != archiveDbExists) ||
|
(!archiveDbExists && !state.archiveDb.empty()) || (writableDbExists != archiveDbExists) ||
|
||||||
state.writableDb.empty() != state.archiveDb.empty())
|
state.writableDb.empty() != state.archiveDb.empty())
|
||||||
{
|
{
|
||||||
boost::filesystem::path stateDbPathName = app_.config().legacy(Sections::kDatabasePath);
|
std::filesystem::path stateDbPathName = app_.config().legacy(Sections::kDatabasePath);
|
||||||
stateDbPathName /= dbName_;
|
stateDbPathName /= dbName_;
|
||||||
stateDbPathName += "*";
|
stateDbPathName += "*";
|
||||||
|
|
||||||
@@ -477,15 +477,15 @@ SHAMapStoreImp::dbPaths()
|
|||||||
}
|
}
|
||||||
|
|
||||||
// The necessary directories exist. Now, remove any others.
|
// The necessary directories exist. Now, remove any others.
|
||||||
for (boost::filesystem::path const& p : pathsToDelete)
|
for (std::filesystem::path const& p : pathsToDelete)
|
||||||
boost::filesystem::remove_all(p);
|
std::filesystem::remove_all(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<NodeStore::Backend>
|
std::unique_ptr<NodeStore::Backend>
|
||||||
SHAMapStoreImp::makeBackendRotating(std::string path)
|
SHAMapStoreImp::makeBackendRotating(std::string path)
|
||||||
{
|
{
|
||||||
Section section{app_.config().section(Sections::kNodeDatabase)};
|
Section section{app_.config().section(Sections::kNodeDatabase)};
|
||||||
boost::filesystem::path newPath;
|
std::filesystem::path newPath;
|
||||||
|
|
||||||
if (!path.empty())
|
if (!path.empty())
|
||||||
{
|
{
|
||||||
@@ -493,10 +493,7 @@ SHAMapStoreImp::makeBackendRotating(std::string path)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
boost::filesystem::path p = get(section, Keys::kPath);
|
newPath = beast::uniqueRandomPath(get(section, Keys::kPath), 100, dbPrefix_ + ".");
|
||||||
p /= dbPrefix_;
|
|
||||||
p += ".%%%%";
|
|
||||||
newPath = boost::filesystem::unique_path(p);
|
|
||||||
}
|
}
|
||||||
section.set(Keys::kPath, newPath.string());
|
section.set(Keys::kPath, newPath.string());
|
||||||
|
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
#include <filesystem>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
@@ -238,7 +239,7 @@ class ValidatorList
|
|||||||
ManifestCache& validatorManifests_;
|
ManifestCache& validatorManifests_;
|
||||||
ManifestCache& publisherManifests_;
|
ManifestCache& publisherManifests_;
|
||||||
TimeKeeper& timeKeeper_;
|
TimeKeeper& timeKeeper_;
|
||||||
boost::filesystem::path const dataPath_;
|
std::filesystem::path const dataPath_;
|
||||||
beast::Journal const j_;
|
beast::Journal const j_;
|
||||||
std::shared_mutex mutable mutex_;
|
std::shared_mutex mutable mutex_;
|
||||||
using scoped_lock = std::scoped_lock<decltype(mutex_)>;
|
using scoped_lock = std::scoped_lock<decltype(mutex_)>;
|
||||||
@@ -866,7 +867,7 @@ private:
|
|||||||
/**
|
/**
|
||||||
* Get the filename used for caching UNLs
|
* Get the filename used for caching UNLs
|
||||||
*/
|
*/
|
||||||
boost::filesystem::path
|
std::filesystem::path
|
||||||
getCacheFileName(scoped_lock const&, PublicKey const& pubKey) const;
|
getCacheFileName(scoped_lock const&, PublicKey const& pubKey) const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -29,12 +29,8 @@
|
|||||||
#include <xrpl/server/Manifest.h>
|
#include <xrpl/server/Manifest.h>
|
||||||
#include <xrpl/server/NetworkOPs.h>
|
#include <xrpl/server/NetworkOPs.h>
|
||||||
|
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/regex/v5/regex.hpp>
|
#include <boost/regex/v5/regex.hpp>
|
||||||
#include <boost/regex/v5/regex_match.hpp>
|
#include <boost/regex/v5/regex_match.hpp>
|
||||||
#include <boost/system/detail/errc.hpp>
|
|
||||||
#include <boost/system/detail/error_code.hpp>
|
|
||||||
#include <boost/system/errc.hpp>
|
|
||||||
|
|
||||||
#include <xrpl.pb.h>
|
#include <xrpl.pb.h>
|
||||||
|
|
||||||
@@ -43,6 +39,7 @@
|
|||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
#include <filesystem>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <iterator>
|
#include <iterator>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
@@ -54,6 +51,7 @@
|
|||||||
#include <shared_mutex>
|
#include <shared_mutex>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <string_view>
|
#include <string_view>
|
||||||
|
#include <system_error>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
@@ -288,7 +286,7 @@ ValidatorList::load(
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
boost::filesystem::path
|
std::filesystem::path
|
||||||
ValidatorList::getCacheFileName(ValidatorList::scoped_lock const&, PublicKey const& pubKey) const
|
ValidatorList::getCacheFileName(ValidatorList::scoped_lock const&, PublicKey const& pubKey) const
|
||||||
{
|
{
|
||||||
return dataPath_ / (kFilePrefix + strHex(pubKey));
|
return dataPath_ / (kFilePrefix + strHex(pubKey));
|
||||||
@@ -372,9 +370,9 @@ ValidatorList::cacheValidatorFile(ValidatorList::scoped_lock const& lock, Public
|
|||||||
if (dataPath_.empty())
|
if (dataPath_.empty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
boost::filesystem::path const filename = getCacheFileName(lock, pubKey);
|
std::filesystem::path const filename = getCacheFileName(lock, pubKey);
|
||||||
|
|
||||||
boost::system::error_code ec;
|
std::error_code ec;
|
||||||
|
|
||||||
json::Value value = buildFileData(strHex(pubKey), publisherLists_.at(pubKey), j_);
|
json::Value value = buildFileData(strHex(pubKey), publisherLists_.at(pubKey), j_);
|
||||||
// xrpld should be the only process writing to this file, so
|
// xrpld should be the only process writing to this file, so
|
||||||
@@ -1283,8 +1281,7 @@ std::vector<std::string>
|
|||||||
ValidatorList::loadLists()
|
ValidatorList::loadLists()
|
||||||
{
|
{
|
||||||
using namespace std::string_literals;
|
using namespace std::string_literals;
|
||||||
using namespace boost::filesystem;
|
using namespace std::filesystem;
|
||||||
using namespace boost::system::errc;
|
|
||||||
|
|
||||||
std::scoped_lock const lock{mutex_};
|
std::scoped_lock const lock{mutex_};
|
||||||
|
|
||||||
@@ -1292,12 +1289,12 @@ ValidatorList::loadLists()
|
|||||||
sites.reserve(publisherLists_.size());
|
sites.reserve(publisherLists_.size());
|
||||||
for (auto const& [pubKey, publisherCollection] : publisherLists_)
|
for (auto const& [pubKey, publisherCollection] : publisherLists_)
|
||||||
{
|
{
|
||||||
boost::system::error_code ec;
|
std::error_code ec;
|
||||||
|
|
||||||
if (publisherCollection.status == PublisherStatus::Available)
|
if (publisherCollection.status == PublisherStatus::Available)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
boost::filesystem::path const filename = getCacheFileName(lock, pubKey);
|
std::filesystem::path const filename = getCacheFileName(lock, pubKey);
|
||||||
|
|
||||||
auto const fullPath{canonical(filename, ec)};
|
auto const fullPath{canonical(filename, ec)};
|
||||||
if (ec)
|
if (ec)
|
||||||
@@ -1308,7 +1305,7 @@ ValidatorList::loadLists()
|
|||||||
{
|
{
|
||||||
// Treat an empty file as a missing file, because
|
// Treat an empty file as a missing file, because
|
||||||
// nobody else is going to write it.
|
// nobody else is going to write it.
|
||||||
ec = make_error_code(no_such_file_or_directory);
|
ec = make_error_code(std::errc::no_such_file_or_directory);
|
||||||
}
|
}
|
||||||
if (ec)
|
if (ec)
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -38,7 +38,6 @@
|
|||||||
#include <xrpl/rdb/RelationalDatabase.h>
|
#include <xrpl/rdb/RelationalDatabase.h>
|
||||||
#include <xrpl/rdb/SociDB.h>
|
#include <xrpl/rdb/SociDB.h>
|
||||||
|
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/format/free_funcs.hpp>
|
#include <boost/format/free_funcs.hpp>
|
||||||
#include <boost/optional/optional.hpp> // IWYU pragma: keep
|
#include <boost/optional/optional.hpp> // IWYU pragma: keep
|
||||||
#include <boost/system/detail/error_code.hpp>
|
#include <boost/system/detail/error_code.hpp>
|
||||||
@@ -56,6 +55,7 @@
|
|||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <exception>
|
#include <exception>
|
||||||
|
#include <filesystem>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
#include <map>
|
#include <map>
|
||||||
@@ -64,6 +64,7 @@
|
|||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <system_error>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <variant>
|
#include <variant>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
@@ -1293,8 +1294,8 @@ getTransaction(
|
|||||||
bool
|
bool
|
||||||
dbHasSpace(soci::session& session, Config const& config, beast::Journal j)
|
dbHasSpace(soci::session& session, Config const& config, beast::Journal j)
|
||||||
{
|
{
|
||||||
boost::filesystem::space_info const space =
|
std::filesystem::space_info const space =
|
||||||
boost::filesystem::space(config.legacy(Sections::kDatabasePath));
|
std::filesystem::space(config.legacy(Sections::kDatabasePath));
|
||||||
|
|
||||||
if (space.available < megabytes(512))
|
if (space.available < megabytes(512))
|
||||||
{
|
{
|
||||||
@@ -1305,9 +1306,9 @@ dbHasSpace(soci::session& session, Config const& config, beast::Journal j)
|
|||||||
if (config.useTxTables())
|
if (config.useTxTables())
|
||||||
{
|
{
|
||||||
DatabaseCon::Setup const dbSetup = setupDatabaseCon(config);
|
DatabaseCon::Setup const dbSetup = setupDatabaseCon(config);
|
||||||
boost::filesystem::path const dbPath = dbSetup.dataDir / kTxDbName;
|
std::filesystem::path const dbPath = dbSetup.dataDir / kTxDbName;
|
||||||
boost::system::error_code ec;
|
std::error_code ec;
|
||||||
std::optional<std::uint64_t> dbSize = boost::filesystem::file_size(dbPath, ec);
|
std::optional<std::uint64_t> dbSize = std::filesystem::file_size(dbPath, ec);
|
||||||
if (ec)
|
if (ec)
|
||||||
{
|
{
|
||||||
JLOG(j.error()) << "Error checking transaction db file size: " << ec.message();
|
JLOG(j.error()) << "Error checking transaction db file size: " << ec.message();
|
||||||
|
|||||||
@@ -11,11 +11,10 @@
|
|||||||
#include <xrpl/protocol/XRPAmount.h>
|
#include <xrpl/protocol/XRPAmount.h>
|
||||||
#include <xrpl/rdb/DatabaseCon.h>
|
#include <xrpl/rdb/DatabaseCon.h>
|
||||||
|
|
||||||
#include <boost/filesystem.hpp> // VFALCO FIX: This include should not be here
|
|
||||||
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
#include <filesystem>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <unordered_set>
|
#include <unordered_set>
|
||||||
@@ -97,17 +96,17 @@ public:
|
|||||||
/**
|
/**
|
||||||
* Returns the full path and filename of the debug log file.
|
* Returns the full path and filename of the debug log file.
|
||||||
*/
|
*/
|
||||||
[[nodiscard]] boost::filesystem::path
|
[[nodiscard]] std::filesystem::path
|
||||||
getDebugLogFile() const;
|
getDebugLogFile() const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
boost::filesystem::path configFile_;
|
std::filesystem::path configFile_;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
boost::filesystem::path configDir;
|
std::filesystem::path configDir;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
boost::filesystem::path debugLogfile_;
|
std::filesystem::path debugLogfile_;
|
||||||
|
|
||||||
void
|
void
|
||||||
load();
|
load();
|
||||||
|
|||||||
@@ -21,21 +21,19 @@
|
|||||||
#include <boost/algorithm/string/replace.hpp>
|
#include <boost/algorithm/string/replace.hpp>
|
||||||
#include <boost/algorithm/string/split.hpp>
|
#include <boost/algorithm/string/split.hpp>
|
||||||
#include <boost/algorithm/string/trim.hpp>
|
#include <boost/algorithm/string/trim.hpp>
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/filesystem/path.hpp>
|
|
||||||
#include <boost/format/free_funcs.hpp>
|
#include <boost/format/free_funcs.hpp>
|
||||||
#include <boost/multiprecision/detail/endian.hpp>
|
#include <boost/multiprecision/detail/endian.hpp>
|
||||||
#include <boost/predef.h>
|
#include <boost/predef.h>
|
||||||
#include <boost/regex.hpp> // IWYU pragma: keep
|
#include <boost/regex.hpp> // IWYU pragma: keep
|
||||||
#include <boost/regex/v5/regex.hpp>
|
#include <boost/regex/v5/regex.hpp>
|
||||||
#include <boost/regex/v5/regex_match.hpp>
|
#include <boost/regex/v5/regex_match.hpp>
|
||||||
#include <boost/system/detail/error_code.hpp>
|
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
|
#include <filesystem>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <iterator>
|
#include <iterator>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
@@ -45,6 +43,7 @@
|
|||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <system_error>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
@@ -313,13 +312,13 @@ Config::setup(std::string const& strConf, bool bQuiet, bool bSilent, bool bStand
|
|||||||
// directory, use the current working directory as the
|
// directory, use the current working directory as the
|
||||||
// config directory and that with "db" as the data
|
// config directory and that with "db" as the data
|
||||||
// directory.
|
// directory.
|
||||||
boost::filesystem::path dataDir;
|
std::filesystem::path dataDir;
|
||||||
|
|
||||||
if (!strConf.empty())
|
if (!strConf.empty())
|
||||||
{
|
{
|
||||||
// --conf=<path> : everything is relative that file.
|
// --conf=<path> : everything is relative that file.
|
||||||
configFile_ = strConf;
|
configFile_ = strConf;
|
||||||
configDir = boost::filesystem::absolute(configFile_);
|
configDir = std::filesystem::absolute(configFile_);
|
||||||
configDir.remove_filename();
|
configDir.remove_filename();
|
||||||
dataDir = configDir / kDatabaseDirName;
|
dataDir = configDir / kDatabaseDirName;
|
||||||
}
|
}
|
||||||
@@ -330,13 +329,13 @@ Config::setup(std::string const& strConf, bool bQuiet, bool bSilent, bool bStand
|
|||||||
// Check if either of the config files exist in the current working
|
// Check if either of the config files exist in the current working
|
||||||
// directory, in which case the databases will be stored in a
|
// directory, in which case the databases will be stored in a
|
||||||
// subdirectory.
|
// subdirectory.
|
||||||
configDir = boost::filesystem::current_path();
|
configDir = std::filesystem::current_path();
|
||||||
dataDir = configDir / kDatabaseDirName;
|
dataDir = configDir / kDatabaseDirName;
|
||||||
configFile_ = configDir / kConfigFileName;
|
configFile_ = configDir / kConfigFileName;
|
||||||
if (boost::filesystem::exists(configFile_))
|
if (std::filesystem::exists(configFile_))
|
||||||
break;
|
break;
|
||||||
configFile_ = configDir / kConfigLegacyName;
|
configFile_ = configDir / kConfigLegacyName;
|
||||||
if (boost::filesystem::exists(configFile_))
|
if (std::filesystem::exists(configFile_))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// Check if the home directory is set, and optionally the XDG config
|
// Check if the home directory is set, and optionally the XDG config
|
||||||
@@ -363,10 +362,10 @@ Config::setup(std::string const& strConf, bool bQuiet, bool bSilent, bool bStand
|
|||||||
dataDir = strXdgDataHome + "/" + systemName();
|
dataDir = strXdgDataHome + "/" + systemName();
|
||||||
configDir = strXdgConfigHome + "/" + systemName();
|
configDir = strXdgConfigHome + "/" + systemName();
|
||||||
configFile_ = configDir / kConfigFileName;
|
configFile_ = configDir / kConfigFileName;
|
||||||
if (boost::filesystem::exists(configFile_))
|
if (std::filesystem::exists(configFile_))
|
||||||
break;
|
break;
|
||||||
configFile_ = configDir / kConfigLegacyName;
|
configFile_ = configDir / kConfigLegacyName;
|
||||||
if (boost::filesystem::exists(configFile_))
|
if (std::filesystem::exists(configFile_))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -374,7 +373,7 @@ Config::setup(std::string const& strConf, bool bQuiet, bool bSilent, bool bStand
|
|||||||
dataDir = "/var/lib/" + systemName();
|
dataDir = "/var/lib/" + systemName();
|
||||||
configDir = "/etc/" + systemName();
|
configDir = "/etc/" + systemName();
|
||||||
configFile_ = configDir / kConfigFileName;
|
configFile_ = configDir / kConfigFileName;
|
||||||
if (boost::filesystem::exists(configFile_))
|
if (std::filesystem::exists(configFile_))
|
||||||
break;
|
break;
|
||||||
configFile_ = configDir / kConfigLegacyName;
|
configFile_ = configDir / kConfigLegacyName;
|
||||||
} while (false);
|
} while (false);
|
||||||
@@ -387,7 +386,7 @@ Config::setup(std::string const& strConf, bool bQuiet, bool bSilent, bool bStand
|
|||||||
std::string const dbPath(legacy(Sections::kDatabasePath));
|
std::string const dbPath(legacy(Sections::kDatabasePath));
|
||||||
if (!dbPath.empty())
|
if (!dbPath.empty())
|
||||||
{
|
{
|
||||||
dataDir = boost::filesystem::path(dbPath);
|
dataDir = std::filesystem::path(dbPath);
|
||||||
}
|
}
|
||||||
else if (runStandalone_)
|
else if (runStandalone_)
|
||||||
{
|
{
|
||||||
@@ -397,13 +396,13 @@ Config::setup(std::string const& strConf, bool bQuiet, bool bSilent, bool bStand
|
|||||||
|
|
||||||
if (!dataDir.empty())
|
if (!dataDir.empty())
|
||||||
{
|
{
|
||||||
boost::system::error_code ec;
|
std::error_code ec;
|
||||||
boost::filesystem::create_directories(dataDir, ec);
|
std::filesystem::create_directories(dataDir, ec);
|
||||||
|
|
||||||
if (ec)
|
if (ec)
|
||||||
Throw<std::runtime_error>(boost::str(boost::format("Can not create %s") % dataDir));
|
Throw<std::runtime_error>(boost::str(boost::format("Can not create %s") % dataDir));
|
||||||
|
|
||||||
legacy(Sections::kDatabasePath, boost::filesystem::absolute(dataDir).string());
|
legacy(Sections::kDatabasePath, std::filesystem::absolute(dataDir).string());
|
||||||
}
|
}
|
||||||
|
|
||||||
HTTPClient::initializeSSLContext(this->sslVerifyDir, this->sslVerifyFile, this->sslVerify, j_);
|
HTTPClient::initializeSSLContext(this->sslVerifyDir, this->sslVerifyFile, this->sslVerify, j_);
|
||||||
@@ -455,7 +454,7 @@ Config::load()
|
|||||||
if (!quiet_)
|
if (!quiet_)
|
||||||
std::cerr << "Loading: " << configFile_ << "\n";
|
std::cerr << "Loading: " << configFile_ << "\n";
|
||||||
|
|
||||||
boost::system::error_code ec;
|
std::error_code ec;
|
||||||
auto const fileContents = getFileContents(ec, configFile_);
|
auto const fileContents = getFileContents(ec, configFile_);
|
||||||
|
|
||||||
if (ec)
|
if (ec)
|
||||||
@@ -508,8 +507,8 @@ Config::loadFromString(std::string const& fileContents)
|
|||||||
std::string dbPath;
|
std::string dbPath;
|
||||||
if (getSingleSection(secConfig, Sections::kDatabasePath, dbPath, j_))
|
if (getSingleSection(secConfig, Sections::kDatabasePath, dbPath, j_))
|
||||||
{
|
{
|
||||||
boost::filesystem::path const p(dbPath);
|
std::filesystem::path const p(dbPath);
|
||||||
legacy(Sections::kDatabasePath, boost::filesystem::absolute(p).string());
|
legacy(Sections::kDatabasePath, std::filesystem::absolute(p).string());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -976,7 +975,7 @@ Config::loadFromString(std::string const& fileContents)
|
|||||||
// If no path was specified, then look for validators.txt
|
// If no path was specified, then look for validators.txt
|
||||||
// in the same directory as the config file, but don't complain
|
// in the same directory as the config file, but don't complain
|
||||||
// if we can't find it.
|
// if we can't find it.
|
||||||
boost::filesystem::path validatorsFile;
|
std::filesystem::path validatorsFile;
|
||||||
|
|
||||||
if (getSingleSection(secConfig, Sections::kValidatorsFile, strTemp, j_))
|
if (getSingleSection(secConfig, Sections::kValidatorsFile, strTemp, j_))
|
||||||
{
|
{
|
||||||
@@ -991,7 +990,7 @@ Config::loadFromString(std::string const& fileContents)
|
|||||||
if (!validatorsFile.is_absolute() && !configDir.empty())
|
if (!validatorsFile.is_absolute() && !configDir.empty())
|
||||||
validatorsFile = configDir / validatorsFile;
|
validatorsFile = configDir / validatorsFile;
|
||||||
|
|
||||||
if (!boost::filesystem::exists(validatorsFile))
|
if (!std::filesystem::exists(validatorsFile))
|
||||||
{
|
{
|
||||||
Throw<std::runtime_error>(
|
Throw<std::runtime_error>(
|
||||||
std::string("The file specified in [") + Sections::kValidatorsFile +
|
std::string("The file specified in [") + Sections::kValidatorsFile +
|
||||||
@@ -1000,8 +999,8 @@ Config::loadFromString(std::string const& fileContents)
|
|||||||
validatorsFile.string());
|
validatorsFile.string());
|
||||||
}
|
}
|
||||||
else if (
|
else if (
|
||||||
!boost::filesystem::is_regular_file(validatorsFile) &&
|
!std::filesystem::is_regular_file(validatorsFile) &&
|
||||||
!boost::filesystem::is_symlink(validatorsFile))
|
!std::filesystem::is_symlink(validatorsFile))
|
||||||
{
|
{
|
||||||
Throw<std::runtime_error>(
|
Throw<std::runtime_error>(
|
||||||
std::string("Invalid file specified in [") + Sections::kValidatorsFile +
|
std::string("Invalid file specified in [") + Sections::kValidatorsFile +
|
||||||
@@ -1014,20 +1013,20 @@ Config::loadFromString(std::string const& fileContents)
|
|||||||
|
|
||||||
if (!validatorsFile.empty())
|
if (!validatorsFile.empty())
|
||||||
{
|
{
|
||||||
if (!boost::filesystem::exists(validatorsFile) ||
|
if (!std::filesystem::exists(validatorsFile) ||
|
||||||
(!boost::filesystem::is_regular_file(validatorsFile) &&
|
(!std::filesystem::is_regular_file(validatorsFile) &&
|
||||||
!boost::filesystem::is_symlink(validatorsFile)))
|
!std::filesystem::is_symlink(validatorsFile)))
|
||||||
{
|
{
|
||||||
validatorsFile.clear();
|
validatorsFile.clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!validatorsFile.empty() && boost::filesystem::exists(validatorsFile) &&
|
if (!validatorsFile.empty() && std::filesystem::exists(validatorsFile) &&
|
||||||
(boost::filesystem::is_regular_file(validatorsFile) ||
|
(std::filesystem::is_regular_file(validatorsFile) ||
|
||||||
boost::filesystem::is_symlink(validatorsFile)))
|
std::filesystem::is_symlink(validatorsFile)))
|
||||||
{
|
{
|
||||||
boost::system::error_code ec;
|
std::error_code ec;
|
||||||
auto const data = getFileContents(ec, validatorsFile);
|
auto const data = getFileContents(ec, validatorsFile);
|
||||||
if (ec)
|
if (ec)
|
||||||
{
|
{
|
||||||
@@ -1160,7 +1159,7 @@ Config::loadFromString(std::string const& fileContents)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
boost::filesystem::path
|
std::filesystem::path
|
||||||
Config::getDebugLogFile() const
|
Config::getDebugLogFile() const
|
||||||
{
|
{
|
||||||
auto logFile = debugLogfile_;
|
auto logFile = debugLogfile_;
|
||||||
@@ -1169,17 +1168,17 @@ Config::getDebugLogFile() const
|
|||||||
{
|
{
|
||||||
// Unless an absolute path for the log file is specified, the
|
// Unless an absolute path for the log file is specified, the
|
||||||
// path is relative to the config file directory.
|
// path is relative to the config file directory.
|
||||||
logFile = boost::filesystem::absolute(logFile, configDir);
|
logFile = std::filesystem::absolute(configDir / logFile);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!logFile.empty())
|
if (!logFile.empty())
|
||||||
{
|
{
|
||||||
auto logDir = logFile.parent_path();
|
auto logDir = logFile.parent_path();
|
||||||
|
|
||||||
if (!boost::filesystem::is_directory(logDir))
|
if (!std::filesystem::is_directory(logDir))
|
||||||
{
|
{
|
||||||
boost::system::error_code ec;
|
std::error_code ec;
|
||||||
boost::filesystem::create_directories(logDir, ec);
|
std::filesystem::create_directories(logDir, ec);
|
||||||
|
|
||||||
// If we fail, we warn but continue so that the calling code can
|
// If we fail, we warn but continue so that the calling code can
|
||||||
// decide how to handle this situation.
|
// decide how to handle this situation.
|
||||||
|
|||||||
@@ -17,11 +17,9 @@
|
|||||||
#include <xrpl/nodestore/Database.h>
|
#include <xrpl/nodestore/Database.h>
|
||||||
#include <xrpl/protocol/jss.h>
|
#include <xrpl/protocol/jss.h>
|
||||||
|
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
#include <boost/system/detail/error_code.hpp>
|
|
||||||
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
#include <filesystem>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <ios>
|
#include <ios>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
@@ -29,6 +27,7 @@
|
|||||||
#include <ostream>
|
#include <ostream>
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <system_error>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
@@ -220,10 +219,10 @@ PerfLogImp::openLog()
|
|||||||
logFile_.close();
|
logFile_.close();
|
||||||
|
|
||||||
auto logDir = setup_.perfLog.parent_path();
|
auto logDir = setup_.perfLog.parent_path();
|
||||||
if (!boost::filesystem::is_directory(logDir))
|
if (!std::filesystem::is_directory(logDir))
|
||||||
{
|
{
|
||||||
boost::system::error_code ec;
|
std::error_code ec;
|
||||||
boost::filesystem::create_directories(logDir, ec);
|
std::filesystem::create_directories(logDir, ec);
|
||||||
if (ec)
|
if (ec)
|
||||||
{
|
{
|
||||||
JLOG(j_.fatal()) << "Unable to create performance log "
|
JLOG(j_.fatal()) << "Unable to create performance log "
|
||||||
@@ -478,17 +477,17 @@ PerfLogImp::stop()
|
|||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
PerfLog::Setup
|
PerfLog::Setup
|
||||||
setupPerfLog(Section const& section, boost::filesystem::path const& configDir)
|
setupPerfLog(Section const& section, std::filesystem::path const& configDir)
|
||||||
{
|
{
|
||||||
PerfLog::Setup setup;
|
PerfLog::Setup setup;
|
||||||
std::string perfLog;
|
std::string perfLog;
|
||||||
set(perfLog, "perf_log", section);
|
set(perfLog, "perf_log", section);
|
||||||
if (!perfLog.empty())
|
if (!perfLog.empty())
|
||||||
{
|
{
|
||||||
setup.perfLog = boost::filesystem::path(perfLog);
|
setup.perfLog = std::filesystem::path(perfLog);
|
||||||
if (setup.perfLog.is_relative())
|
if (setup.perfLog.is_relative())
|
||||||
{
|
{
|
||||||
setup.perfLog = boost::filesystem::absolute(setup.perfLog, configDir);
|
setup.perfLog = std::filesystem::absolute(configDir / setup.perfLog);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user