Merge remote-tracking branch 'origin/master' into ticket

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

diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp
index 73917852462d27aecbd6c78310ba37c68885baef..979081953464c40316b60c8b9708bef2098499a5 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"


@@ -35,9 +36,10 @@
 #include <iostream>
 
 #include <cstdlib> // getenv
 #include <iostream>
 
 #include <cstdlib> // getenv

-#include <cstring> // basename
+#include <cstring> // str*

 
 #include <unistd.h> // access
 
 #include <unistd.h> // access

+#include <libgen.h> // basename

 
 namespace
 {
 
 namespace
 {


@@ -119,7 +121,7 @@ return CONST_METHOD1_ADAPTER<C, A, R>(func, obj);
 
 void Version(const std::string & self)
 {
 
 void Version(const std::string & self)
 {

-std::cout << self << ", version: 2.0.0-alpha.\n";
+std::cout << self << ", version: 2.0.0.\n";

 }
 
 void ReadUserConfigFile(SGCONF::OPTION_BLOCK & block)
 }
 
 void ReadUserConfigFile(SGCONF::OPTION_BLOCK & block)


@@ -163,7 +165,7 @@ class CONFIG_ACTION : public ACTION
         virtual std::string ParamDescription() const { return m_description; }
         virtual std::string DefaultDescription() const { return ""; }
         virtual OPTION_BLOCK & Suboptions() { return m_suboptions; }
         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);
+        virtual PARSER_STATE Parse(int argc, char ** argv, void * /*data*/);

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


@@ -175,7 +177,7 @@ class CONFIG_ACTION : public ACTION
 };
 
 
 };
 
 

-PARSER_STATE CONFIG_ACTION::Parse(int argc, char ** argv)
+PARSER_STATE CONFIG_ACTION::Parse(int argc, char ** argv, void * /*data*/)

 {
 if (argc == 0 ||
     argv == NULL ||
 {
 if (argc == 0 ||
     argv == NULL ||


@@ -250,10 +252,15 @@ blocks.Add("General options")
 SGCONF::OPTION_BLOCK & block = blocks.Add("Connection options")
       .Add("s", "server", SGCONF::MakeParamAction(config.server, std::string("localhost"), "<address>"), "\t\thost to connect")
       .Add("p", "port", SGCONF::MakeParamAction(config.port, uint16_t(5555), "<port>"), "\t\tport to connect")
 SGCONF::OPTION_BLOCK & block = blocks.Add("Connection options")
       .Add("s", "server", SGCONF::MakeParamAction(config.server, std::string("localhost"), "<address>"), "\t\thost to connect")
       .Add("p", "port", SGCONF::MakeParamAction(config.port, uint16_t(5555), "<port>"), "\t\tport to connect")

+      .Add("local-address", SGCONF::MakeParamAction(config.localAddress, std::string(""), "<address>"), "\tlocal address to bind")
+      .Add("local-port", SGCONF::MakeParamAction(config.localPort, uint16_t(0), "<port>"), "\t\tlocal port to bind")

       .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);


@@ -298,15 +305,19 @@ else
     }
 
 config = configOverride;
     }
 
 config = configOverride;

+
+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)
 {
 std::cerr << ex.what() << "\n";
 return -1;
 }
 }
 catch (const std::exception& ex)
 {
 std::cerr << ex.what() << "\n";
 return -1;
 }

-
-std::cerr << "Config: " << config.Serialize() << std::endl;
-return commands.Execute(config) ? 0 : -1;

 }
 //-----------------------------------------------------------------------------
 
 }
 //-----------------------------------------------------------------------------