From: Naffanya Date: Wed, 12 Jun 2013 11:03:52 +0000 (+0300) Subject: code correction: removal spaces X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/f3555eaeee988c834b068f96bcc1ef7130b886de?ds=sidebyside code correction: removal spaces --- diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp index 8d0f6d20..09f0970f 100644 --- a/projects/stargazer/main.cpp +++ b/projects/stargazer/main.cpp @@ -266,7 +266,6 @@ if (settings->ReadSettings()) STG_LOGGER & WriteServLog = GetStgLogger(); if (settings->GetLogFileName() != "") WriteServLog.SetLogFileName(settings->GetLogFileName()); - WriteServLog("ReadSettings error. %s", settings->GetStrError().c_str()); exit(1); } @@ -280,7 +279,6 @@ if (settings->ReadSettings()) } printfd(__FILE__, "--- End dump ---\n"); /*************************************************************************************************/ - #ifndef NO_DAEMON std::string startFile(settings->GetConfDir() + START_FILE); #endif diff --git a/projects/stargazer/settings_impl.h b/projects/stargazer/settings_impl.h index 42f3541d..7dc742f5 100644 --- a/projects/stargazer/settings_impl.h +++ b/projects/stargazer/settings_impl.h @@ -97,8 +97,7 @@ public: const MODULE_SETTINGS & GetStoreModuleSettings() const { return storeModuleSettings; } const std::vector & GetModulesSettings() const - { return modulesSettings; } - + { return modulesSettings; } const std::vector & GetScriptParams() const { return scriptParams; } private: @@ -118,10 +117,8 @@ private: std::string rules; std::string logFile; std::string pidFile; - std::string monitorDir; - + std::string monitorDir; std::vector scriptParams; - bool monitoring; unsigned detailStatWritePeriod; unsigned statWritePeriod; @@ -140,8 +137,7 @@ private: bool reconnectOnTariffChange; std::vector modulesSettings; - MODULE_SETTINGS storeModuleSettings; - + MODULE_SETTINGS storeModuleSettings; STG_LOGGER & logger; }; //-----------------------------------------------------------------------------