Ticket. The stgTime argument added in TariffChangeIsAllowed() function

[stg.git] / projects / stargazer / plugins / configuration / rpcconfig / rpcconfig.cpp

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
index dca87fbee34ce8a65eb0bc85997c6e57b54ec6cc..3b28ddd809f1ac4cbc2d52c321fc1b97bbe9ccf8 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
@@ -33,8 +33,7 @@ PLUGIN_CREATOR<RPC_CONFIG> rpcc;
 extern "C" PLUGIN * GetPlugin();
 
 RPC_CONFIG_SETTINGS::RPC_CONFIG_SETTINGS()
-    : errorStr(),
-      port(0),
+    : port(0),
       cookieTimeout(0)
 {
 }
@@ -45,7 +44,7 @@ PARAM_VALUE pv;
 pv.param = "Port";
 std::vector<PARAM_VALUE>::const_iterator pvi;
 pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
-if (pvi == s.moduleParams.end())
+if (pvi == s.moduleParams.end() || pvi->value.empty())
     {
     errorStr = "Parameter \'Port\' not found.";
     printfd(__FILE__, "Parameter 'Port' not found\n");
@@ -62,7 +61,7 @@ port = static_cast<uint16_t>(p);
 
 pv.param = "CookieTimeout";
 pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
-if (pvi == s.moduleParams.end())
+if (pvi == s.moduleParams.end() || pvi->value.empty())
     {
     cookieTimeout = 1800; // 30 * 60
     }
@@ -85,22 +84,15 @@ return rpcc.GetPlugin();
 }
 
 RPC_CONFIG::RPC_CONFIG()
-    : errorStr(),
-      rpcConfigSettings(),
-      users(NULL),
+    : users(NULL),
       admins(NULL),
       tariffs(NULL),
       store(NULL),
-      settings(),
       fd(-1),
-      rpcRegistry(),
       rpcServer(NULL),
       running(false),
       stopped(true),
-      tid(),
-      cookies(),
       dayFee(0),
-      dirNames(),
       logger(GetPluginLogger(GetStgLogger(), "conf_rpc"))
 {
 }