X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/a622b081808494796d3679acaebbf5ee364fe9de..d85b9b78208ab29e073e6c37c02844407256c47c:/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp index ea71a117..f5687699 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp @@ -12,7 +12,7 @@ //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -PLUGIN_CREATOR stgc; +static PLUGIN_CREATOR stgc; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -20,7 +20,7 @@ int STG_CONFIG_SETTINGS::ParseSettings(const MODULE_SETTINGS & s) { int p; PARAM_VALUE pv; -vector::const_iterator pvi; +std::vector::const_iterator pvi; /////////////////////////// pv.param = "Port"; pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv); @@ -36,7 +36,7 @@ if (ParseIntInRange(pvi->value[0], 2, 65535, &p)) printfd(__FILE__, "%s\n", errorStr.c_str()); return -1; } -port = p; +port = static_cast(p); return 0; } @@ -50,7 +50,7 @@ return stgc.GetPlugin(); //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -const std::string STG_CONFIG::GetVersion() const +std::string STG_CONFIG::GetVersion() const { return "Stg configurator v.0.08"; } @@ -61,7 +61,8 @@ STG_CONFIG::STG_CONFIG() thread(), nonstop(false), isRunning(false), - config(), + logger(GetPluginLogger(GetStgLogger(), "conf_sg")), + config(logger), users(NULL), admins(NULL), tariffs(NULL), @@ -103,6 +104,7 @@ if (pthread_create(&thread, NULL, Run, this)) { errorStr = "Cannot create thread."; printfd(__FILE__, "Cannot create thread\n"); + logger("Cannot create thread."); return -1; } errorStr = ""; @@ -139,7 +141,7 @@ sigset_t signalSet; sigfillset(&signalSet); pthread_sigmask(SIG_BLOCK, &signalSet, NULL); -STG_CONFIG * stgConf = (STG_CONFIG *)d; +STG_CONFIG * stgConf = static_cast(d); stgConf->isRunning = true; stgConf->config.Run();