X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/a5b2a0646b1822cd2786bf983bfeb8321e9dfa3c..27ac6cd34ada410ecfb322007fa0a9f16a777a89:/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h?ds=sidebyside diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h index ce1c3af8..8fa4dc76 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h +++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h @@ -7,6 +7,7 @@ #include "stg/plugin.h" #include "stg/store.h" +#include "stg/logger.h" #include "configproto.h" extern "C" PLUGIN * GetPlugin(); @@ -15,26 +16,25 @@ class STG_CONFIG; class STG_CONFIG_SETTINGS { public: - STG_CONFIG_SETTINGS() : port(0) {} + STG_CONFIG_SETTINGS() : errorStr(), port(0) {} virtual ~STG_CONFIG_SETTINGS() {} const std::string & GetStrError() const { return errorStr; } int ParseSettings(const MODULE_SETTINGS & s); uint16_t GetPort() const { return port; } private: std::string errorStr; - int port; + uint16_t port; }; //----------------------------------------------------------------------------- class STG_CONFIG :public PLUGIN { public: STG_CONFIG(); - virtual ~STG_CONFIG(){}; + virtual ~STG_CONFIG(){} void SetUsers(USERS * u) { users = u; } void SetTariffs(TARIFFS * t) { tariffs = t; } void SetAdmins(ADMINS * a) { admins = a; } void SetStore(STORE * s) { store = s; } - void SetTraffcounter(TRAFFCOUNTER *) {} void SetStgSettings(const SETTINGS * s) { stgSettings = s; } void SetSettings(const MODULE_SETTINGS & s) { settings = s; } int ParseSettings(); @@ -45,17 +45,22 @@ public: bool IsRunning() { return isRunning; } const std::string & GetStrError() const { return errorStr; } - const std::string GetVersion() const; - uint16_t GetStartPosition() const { return 220; } - uint16_t GetStopPosition() const { return 220; } + std::string GetVersion() const; + uint16_t GetStartPosition() const { return 20; } + uint16_t GetStopPosition() const { return 20; } private: + STG_CONFIG(const STG_CONFIG & rvalue); + STG_CONFIG & operator=(const STG_CONFIG & rvalue); + static void * Run(void *); + mutable std::string errorStr; STG_CONFIG_SETTINGS stgConfigSettings; pthread_t thread; bool nonstop; bool isRunning; + PLUGIN_LOGGER logger; CONFIGPROTO config; USERS * users; ADMINS * admins;