-#include <unistd.h>
+#include "stgconfig.h"
+
+#include "stg/plugin_creator.h"
+#include "stg/common.h"
-#include <csignal>
#include <algorithm>
+#include <csignal>
-#include "stg/tariffs.h"
-#include "stg/admins.h"
-#include "stg/users.h"
-#include "stg/plugin_creator.h"
-#include "stgconfig.h"
+#include <unistd.h>
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-PLUGIN_CREATOR<STG_CONFIG> stgc;
+static PLUGIN_CREATOR<STG_CONFIG> stgc;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
{
int p;
PARAM_VALUE pv;
-vector<PARAM_VALUE>::const_iterator pvi;
+std::vector<PARAM_VALUE>::const_iterator pvi;
///////////////////////////
pv.param = "Port";
pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
printfd(__FILE__, "%s\n", errorStr.c_str());
return -1;
}
-port = p;
+port = static_cast<uint16_t>(p);
return 0;
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-const std::string STG_CONFIG::GetVersion() const
+std::string STG_CONFIG::GetVersion() const
{
return "Stg configurator v.0.08";
}
thread(),
nonstop(false),
isRunning(false),
- config(),
- users(NULL),
- admins(NULL),
- tariffs(NULL),
- store(NULL),
- settings(),
- stgSettings(NULL)
+ logger(GetPluginLogger(GetStgLogger(), "conf_sg")),
+ config(logger),
+ settings()
{
}
//-----------------------------------------------------------------------------
nonstop = true;
config.SetPort(stgConfigSettings.GetPort());
-config.SetAdmins(admins);
-config.SetUsers(users);
-config.SetTariffs(tariffs);
-config.SetStgSettings(stgSettings);
-config.SetStore(store);
if (config.Prepare())
{
{
errorStr = "Cannot create thread.";
printfd(__FILE__, "Cannot create thread\n");
+ logger("Cannot create thread.");
return -1;
}
errorStr = "";
config.Stop();
//5 seconds to thread stops itself
-int i;
-for (i = 0; i < 25; i++)
+for (int i = 0; i < 25; i++)
{
if (!isRunning)
break;
sigfillset(&signalSet);
pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
-STG_CONFIG * stgConf = (STG_CONFIG *)d;
+STG_CONFIG * stgConf = static_cast<STG_CONFIG *>(d);
stgConf->isRunning = true;
stgConf->config.Run();