Verified Commit 99689b71 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Remove unused configuration options

parent 2db84820

etc/scord.conf.in

+2 −8
Original line number Diff line number Diff line
@@ -7,16 +7,10 @@ global_settings: [ 
  use_syslog: false,



  # log file

  log_file: "@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/@CMAKE_PROJECT_NAME@.log",



  # path to globally-accessible socket

  global_socket: "@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/global.socket.2",



  # path to admin-accessible socket

  control_socket: "@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/control.socket.2",

  log_file: "@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/@CMAKE_PROJECT_NAME@/@CMAKE_PROJECT_NAME@.log",



  # path to pidfile

  pidfile: "@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/@CMAKE_PROJECT_NAME@.pid",

  pidfile: "@CMAKE_INSTALL_FULL_RUNSTATEDIR@/@CMAKE_PROJECT_NAME@/@CMAKE_PROJECT_NAME@.pid",



  # transport protocol used for communication

  transport_protocol: "@SCORD_TRANSPORT_PROTOCOL@",

src/config/config_schema.hpp

+0 −8
Original line number Diff line number Diff line
@@ -64,14 +64,6 @@ const file_schema valid_options = declare_file({ 
                                keywords::log_file_max_size, opt_type::optional,

                                converter<uint32_t>(parsers::parse_capacity)),



                        declare_option<fs::path>(

                                keywords::global_socket, opt_type::mandatory,

                                converter<fs::path>(parsers::parse_path)),



                        declare_option<fs::path>(

                                keywords::control_socket, opt_type::mandatory,

                                converter<fs::path>(parsers::parse_path)),



                        declare_option<std::string>(

                                keywords::transport_protocol,

                                opt_type::mandatory),

src/config/defaults.cpp.in

+0 −4
Original line number Diff line number Diff line
@@ -38,10 +38,6 @@ const bool use_console = false; 
const std::filesystem::path log_file = {};

const uint32_t log_file_max_size = static_cast<uint32_t>(16 * 1024 * 1024);



const char* global_socket =

        "@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/global.socket.2";

const char* control_socket =

        "@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/control.socket.2";

const char* transport_protocol = "ofi+tcp";

const char* bind_address = "127.0.0.1";

const in_port_t remote_port = 42000;

src/config/defaults.hpp

+0 −2
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ extern const bool use_syslog; 
extern const bool use_console;

extern const fs::path log_file;

extern const uint32_t log_file_max_size;

extern const char* global_socket;

extern const char* control_socket;

extern const char* transport_protocol;

extern const char* bind_address;

extern const in_port_t remote_port;

src/config/keywords.hpp

+0 −2
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ constexpr static const auto namespaces = "namespaces"; 
constexpr static const auto use_syslog = "use_syslog";

constexpr static const auto log_file = "log_file";

constexpr static const auto log_file_max_size = "log_file_max_size";

constexpr static const auto global_socket = "global_socket";

constexpr static const auto control_socket = "control_socket";

constexpr static const auto transport_protocol = "transport_protocol";

constexpr static const auto bind_address = "bind_address";

constexpr static const auto remote_port = "remote_port";