Skip to content
Snippets Groups Projects

Release 0.1

Merged Timm Fitschen requested to merge dev into main
12 files
+ 34
39
Compare changes
  • Side-by-side
  • Inline
Files
12
@@ -25,6 +25,7 @@
#include "caosdb/certificate_provider.h" // for CertificateProvider, path
#include "caosdb/exceptions.h" // for ConfigurationError
#include "caosdb/logging.h" // for CAOSDB_LOG_...
#include "caosdb/protobuf_helper.h" // for reset_arena
#include "caosdb/utility.h" // for load_json_file
// IWYU pragma: no_include "boost/json/fwd.hpp"
#include <boost/filesystem/operations.hpp> // for exists
@@ -32,10 +33,12 @@
#include <boost/json/object.hpp> // for object
#include <boost/json/value.hpp> // for value
#include <boost/json/value_ref.hpp> // IWYU pragma: keep
#include <google/protobuf/arena.h> // for Arena
#include <grpcpp/security/credentials.h> // for ChannelCredentials
#include <iosfwd> // for ostream
#include <memory> // for unique_ptr, shared_ptr
#include <string> // for string
#include <iostream>
#include <memory> // for unique_ptr, shared_ptr
#include <string> // for string
namespace caosdb::configuration {
using boost::filesystem::exists;
@@ -47,6 +50,7 @@ using caosdb::authentication::Authenticator;
using caosdb::authentication::PlainPasswordAuthenticator;
using caosdb::exceptions::ConfigurationError;
using caosdb::utility::load_json_file;
using google::protobuf::Arena;
using grpc::ChannelCredentials;
const std::string logger_name = "caosdb::configuration";
@@ -218,7 +222,10 @@ public:
ConfigurationManager(ConfigurationManager const &) = delete;
void operator=(ConfigurationManager const &) = delete;
inline static auto GetArena() -> Arena * { return &GetInstance().arena; }
private:
Arena arena;
value json_configuration;
ConnectionConfigurationHelper connection_configuration_helper;
LoggingConfigurationHelper logging_configuration_helper;
Loading