More jthreads.

[stg.git] / projects / sgconf / main.cpp

diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp
index 82372224ba20ea6aacb7c9204548edc1dc23f9f3..3413dbd9177cb74e71ff6275605a1e0cb7c5b806 100644 (file)
--- a/projects/sgconf/main.cpp
+++ b/projects/sgconf/main.cpp
@@ -25,6 +25,7 @@
 #include "users.h"
 #include "services.h"
 #include "corps.h"
 #include "users.h"
 #include "services.h"
 #include "corps.h"

+#include "info.h"

 
 #include "api_action.h"
 #include "options.h"
 
 #include "api_action.h"
 #include "options.h"


@@ -72,7 +73,7 @@ template <typename A, typename R>
 class FUNC1_ADAPTER : public std::unary_function<A, R>
 {
     public:
 class FUNC1_ADAPTER : public std::unary_function<A, R>
 {
     public:

-        FUNC1_ADAPTER(R (*func)(A)) : m_func(func) {}
+        explicit FUNC1_ADAPTER(R (*func)(A)) : m_func(func) {}

         const R operator()(A arg) const { return (m_func)(arg); }
     private:
         R (*m_func)(A);
         const R operator()(A arg) const { return (m_func)(arg); }
     private:
         R (*m_func)(A);


@@ -159,12 +160,10 @@ class CONFIG_ACTION : public ACTION
               m_description(paramDescription)
         {}
 
               m_description(paramDescription)
         {}
 

-        virtual ACTION * Clone() const { return new CONFIG_ACTION(*this); }
-
-        virtual std::string ParamDescription() const { return m_description; }
-        virtual std::string DefaultDescription() const { return ""; }
-        virtual OPTION_BLOCK & Suboptions() { return m_suboptions; }
-        virtual PARSER_STATE Parse(int argc, char ** argv, void * /*data*/);
+        std::string ParamDescription() const override { return m_description; }
+        std::string DefaultDescription() const override { return ""; }
+        OPTION_BLOCK & Suboptions() override { return m_suboptions; }
+        PARSER_STATE Parse(int argc, char ** argv, void * /*data*/) override;

 
     private:
         SGCONF::CONFIG & m_config;
 
     private:
         SGCONF::CONFIG & m_config;


@@ -226,11 +225,10 @@ else
     }
 }
 
     }
 }
 

-inline
-CONFIG_ACTION * MakeParamAction(SGCONF::CONFIG & config,
-                                const std::string & paramDescription)
+std::unique_ptr<SGCONF::ACTION> MakeParamAction(SGCONF::CONFIG & config,
+                                                const std::string & paramDescription)

 {
 {

-return new CONFIG_ACTION(config, paramDescription);
+return std::make_unique<CONFIG_ACTION>(config, paramDescription);

 }
 
 } // namespace SGCONF
 }
 
 } // namespace SGCONF


@@ -256,7 +254,10 @@ SGCONF::OPTION_BLOCK & block = blocks.Add("Connection options")
       .Add("u", "username", SGCONF::MakeParamAction(config.userName, std::string("admin"), "<username>"), "\tadministrative login")
       .Add("w", "userpass", SGCONF::MakeParamAction(config.userPass, "<password>"), "\tpassword for the administrative login")
       .Add("a", "address", SGCONF::MakeParamAction(config, "<connection string>"), "connection params as a single string in format: <login>:<password>@<host>:<port>");
       .Add("u", "username", SGCONF::MakeParamAction(config.userName, std::string("admin"), "<username>"), "\tadministrative login")
       .Add("w", "userpass", SGCONF::MakeParamAction(config.userPass, "<password>"), "\tpassword for the administrative login")
       .Add("a", "address", SGCONF::MakeParamAction(config, "<connection string>"), "connection params as a single string in format: <login>:<password>@<host>:<port>");

+blocks.Add("Debug options")
+      .Add("show-config", SGCONF::MakeParamAction(config.showConfig), "\tshow config and exit");

 SGCONF::AppendXMLOptionBlock(commands, blocks);
 SGCONF::AppendXMLOptionBlock(commands, blocks);

+SGCONF::AppendServerInfoBlock(commands, blocks);

 SGCONF::AppendAdminsOptionBlock(commands, blocks);
 SGCONF::AppendTariffsOptionBlock(commands, blocks);
 SGCONF::AppendUsersOptionBlock(commands, blocks);
 SGCONF::AppendAdminsOptionBlock(commands, blocks);
 SGCONF::AppendTariffsOptionBlock(commands, blocks);
 SGCONF::AppendUsersOptionBlock(commands, blocks);


@@ -302,7 +303,11 @@ else
 
 config = configOverride;
 
 
 config = configOverride;
 

-std::cerr << "Config: " << config.Serialize() << std::endl;
+if (!config.showConfig.empty() && config.showConfig.data())
+    {
+    std::cout << config.Serialize() << std::endl;
+    return 0;
+    }

 return commands.Execute(config) ? 0 : -1;
 }
 catch (const std::exception& ex)
 return commands.Execute(config) ? 0 : -1;
 }
 catch (const std::exception& ex)