Verbose test reports on failures.

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

diff --git a/projects/sgconf/info.cpp b/projects/sgconf/info.cpp
index 0e98d3dcb81b80515eddab92bba7ca5944a396fb..cf6d44a451131cea3d5f5a79102a1a7a8c2b2a06 100644 (file)
--- a/projects/sgconf/info.cpp
+++ b/projects/sgconf/info.cpp
@@ -2,6 +2,7 @@
 
 #include "api_action.h"
 #include "options.h"
 
 #include "api_action.h"
 #include "options.h"

+#include "makeproto.h"

 #include "config.h"
 
 #include "stg/servconf.h"
 #include "config.h"
 
 #include "stg/servconf.h"


@@ -15,7 +16,7 @@
 namespace
 {
 
 namespace
 {
 

-void PrintInfo(const STG::SERVER_INFO::INFO& info)
+void PrintInfo(const STG::ServerInfo::Info& info)

 {
     std::cout << "Server version: '" << info.version << "'\n"
               << "Number of tariffs: " << info.tariffNum << "\n"
 {
     std::cout << "Server version: '" << info.version << "'\n"
               << "Number of tariffs: " << info.tariffNum << "\n"


@@ -28,7 +29,7 @@ void PrintInfo(const STG::SERVER_INFO::INFO& info)
         std::cout << "\t - '" << info.dirName[i] << "'\n";
 }
 
         std::cout << "\t - '" << info.dirName[i] << "'\n";
 }
 

-void InfoCallback(bool result, const std::string & reason, const STG::SERVER_INFO::INFO & info, void * /*data*/)
+void InfoCallback(bool result, const std::string & reason, const STG::ServerInfo::Info & info, void * /*data*/)

 {
 if (!result)
     {
 {
 if (!result)
     {


@@ -42,13 +43,7 @@ bool InfoFunction(const SGCONF::CONFIG & config,
                   const std::string& /*arg*/,
                   const std::map<std::string, std::string> & /*options*/)
 {
                   const std::string& /*arg*/,
                   const std::map<std::string, std::string> & /*options*/)
 {

-STG::SERVCONF proto(config.server.data(),
-                    config.port.data(),
-                    config.localAddress.data(),
-                    config.localPort.data(),
-                    config.userName.data(),
-                    config.userPass.data());
-return proto.ServerInfo(InfoCallback, NULL) == STG::st_ok;
+return makeProto(config).ServerInfo(InfoCallback, NULL) == STG::st_ok;

 }
 
 }
 }
 
 }