X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/a6680ce3d763763a6010c81c8a5a8f7a1ce052db..a500fb72810060e52d87ad2c2e4691531f0bcc5a:/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h index bf4f6195..f4f94ee8 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h +++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h @@ -18,8 +18,7 @@ * Author : Boris Mikhailenko */ -#ifndef STGCONFIG_H -#define STGCONFIG_H +#pragma once #include "configproto.h" @@ -27,16 +26,17 @@ #include "stg/logger.h" #include - -#include +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow" +#include +#pragma GCC diagnostic pop class STG_CONFIG_SETTINGS { public: STG_CONFIG_SETTINGS() : m_port(0), m_bindAddress("0.0.0.0") {} - virtual ~STG_CONFIG_SETTINGS() {} const std::string & GetStrError() const { return errorStr; } - bool ParseSettings(const MODULE_SETTINGS & s); + bool ParseSettings(const STG::ModuleSettings & s); uint16_t GetPort() const { return m_port; } const std::string & GetBindAddress() const { return m_bindAddress; } private: @@ -45,46 +45,43 @@ class STG_CONFIG_SETTINGS std::string m_bindAddress; }; -class STG_CONFIG : public PLUGIN +class STG_CONFIG : public STG::Plugin { public: STG_CONFIG(); - void SetUsers(USERS * users) { config.SetUsers(users); } - void SetTariffs(TARIFFS * tariffs) { config.SetTariffs(tariffs); } - void SetAdmins(ADMINS * admins) { config.SetAdmins(admins); } - void SetServices(SERVICES * services) { config.SetServices(services); } - void SetCorporations(CORPORATIONS * corporations) { config.SetCorporations( corporations); } - void SetStore(STORE * store) { config.SetStore(store); } - void SetStgSettings(const SETTINGS * s) { config.SetSettings(s); } - void SetSettings(const MODULE_SETTINGS & s) { settings = s; } - int ParseSettings(); + void SetUsers(STG::Users * users) override { config.SetUsers(users); } + void SetTariffs(STG::Tariffs * tariffs) override { config.SetTariffs(tariffs); } + void SetAdmins(STG::Admins * admins) override { config.SetAdmins(admins); } + void SetServices(STG::Services * services) override { config.SetServices(services); } + void SetCorporations(STG::Corporations * corporations) override { config.SetCorporations( corporations); } + void SetStore(STG::Store * store) override { config.SetStore(store); } + void SetStgSettings(const STG::Settings * s) override { config.SetSettings(s); } + void SetSettings(const STG::ModuleSettings & s) override { settings = s; } + int ParseSettings() override; - int Start(); - int Stop(); - int Reload(const MODULE_SETTINGS & /*ms*/) { return 0; } - bool IsRunning() { return isRunning; } + int Start() override; + int Stop() override; + int Reload(const STG::ModuleSettings & /*ms*/) override { return 0; } + bool IsRunning() override { return isRunning; } - const std::string & GetStrError() const { return errorStr; } - std::string GetVersion() const { return "Stg Configurator v. 2.0"; } - uint16_t GetStartPosition() const { return 20; } - uint16_t GetStopPosition() const { return 20; } + const std::string & GetStrError() const override { return errorStr; } + std::string GetVersion() const override { return "Stg Configurator v. 2.0"; } + uint16_t GetStartPosition() const override { return 20; } + uint16_t GetStopPosition() const override { return 20; } private: STG_CONFIG(const STG_CONFIG & rvalue); STG_CONFIG & operator=(const STG_CONFIG & rvalue); - static void * Run(void *); + void Run(std::stop_token token); mutable std::string errorStr; STG_CONFIG_SETTINGS stgConfigSettings; - pthread_t thread; + std::jthread m_thread; bool nonstop; bool isRunning; - PLUGIN_LOGGER logger; + STG::PluginLogger logger; CONFIGPROTO config; - MODULE_SETTINGS settings; + STG::ModuleSettings settings; }; -//----------------------------------------------------------------------------- - -#endif