Merge remote-tracking branch 'github/master'

[stg.git] / projects / stargazer / plugins / store / firebird / firebird_store.h

diff --git a/projects/stargazer/plugins/store/firebird/firebird_store.h b/projects/stargazer/plugins/store/firebird/firebird_store.h
index 736451ec31e675943aeb1f1bd3f82098772b1d8b..a34b758f0e28591aec1d23fcc96cc87e53163758 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store.h
+++ b/projects/stargazer/plugins/store/firebird/firebird_store.h
@@ -21,103 +21,107 @@
 #pragma once
 
 #include "stg/store.h"
 #pragma once
 
 #include "stg/store.h"

-#include "stg/locker.h"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"

 #include "stg/ibpp.h"
 #include "stg/ibpp.h"

+#pragma GCC diagnostic push

 #include "stg/logger.h"
 #include "stg/module_settings.h"
 
 #include <ctime>
 #include <string>
 #include <vector>
 #include "stg/logger.h"
 #include "stg/module_settings.h"
 
 #include <ctime>
 #include <string>
 #include <vector>

+#include <mutex>

 
 

-class FIREBIRD_STORE : public STG::Store {
-public:
-    FIREBIRD_STORE();
-    ~FIREBIRD_STORE() override;
-
-    int GetUsersList(std::vector<std::string> * usersList) const override;
-    int AddUser(const std::string & login) const override;
-    int DelUser(const std::string & login) const override;
-    int SaveUserStat(const STG::UserStat & stat, const std::string & login) const override;
-    int SaveUserConf(const STG::UserConf & conf, const std::string & login) const override;
-    int RestoreUserStat(STG::UserStat * stat, const std::string & login) const override;
-    int RestoreUserConf(STG::UserConf * conf, const std::string & login) const override;
-    int WriteUserChgLog(const std::string & login,
-                        const std::string & admLogin,
-                        uint32_t admIP,
-                        const std::string & paramName,
-                        const std::string & oldValue,
-                        const std::string & newValue,
-                        const std::string & message) const override;
-    int WriteUserConnect(const std::string & login, uint32_t ip) const override;
-    int WriteUserDisconnect(const std::string & login,
-                            const STG::DirTraff & up,
-                            const STG::DirTraff & down,
-                            const STG::DirTraff & sessionUp,
-                            const STG::DirTraff & sessionDown,
-                            double cash,
-                            double freeMb,
-                            const std::string & reason) const override;
-    int WriteDetailedStat(const STG::TraffStat & statTree,
-                          time_t lastStat,
-                          const std::string & login) const override;
-
-    int AddMessage(STG::Message * msg, const std::string & login) const override;
-    int EditMessage(const STG::Message & msg, const std::string & login) const override;
-    int GetMessage(uint64_t id, STG::Message * msg, const std::string & login) const override;
-    int DelMessage(uint64_t id, const std::string & login) const override;
-    int GetMessageHdrs(std::vector<STG::Message::Header> * hdrsList, const std::string & login) const override;
-
-    int SaveMonthStat(const STG::UserStat & stat, int month, int year, const std::string  & login) const override;
-
-    int GetAdminsList(std::vector<std::string> * adminsList) const override;
-    int SaveAdmin(const STG::AdminConf & ac) const override;
-    int RestoreAdmin(STG::AdminConf * ac, const std::string & login) const override;
-    int AddAdmin(const std::string & login) const override;
-    int DelAdmin(const std::string & login) const override;
-
-    int GetTariffsList(std::vector<std::string> * tariffsList) const override;
-    int AddTariff(const std::string & name) const override;
-    int DelTariff(const std::string & name) const override;
-    int SaveTariff(const STG::TariffData & td, const std::string & tariffName) const override;
-    int RestoreTariff(STG::TariffData * td, const std::string & tariffName) const override;
-
-    int GetCorpsList(std::vector<std::string> * corpsList) const override;
-    int SaveCorp(const STG::CorpConf & cc) const override;
-    int RestoreCorp(STG::CorpConf * cc, const std::string & name) const override;
-    int AddCorp(const std::string & name) const override;
-    int DelCorp(const std::string & name) const override;
-
-    inline void SetSettings(const STG::ModuleSettings & s) override { settings = s; }
-    int ParseSettings() override;
-
-    inline const std::string & GetStrError() const override { return strError; }
-
-    inline const std::string & GetVersion() const override { return version; }
-
-    int GetServicesList(std::vector<std::string> * servicesList) const override;
-    int SaveService(const STG::ServiceConf & sc) const override;
-    int RestoreService(STG::ServiceConf * sc, const std::string & name) const override;
-    int AddService(const std::string & name) const override;
-    int DelService(const std::string & name) const override;
-
-private:
-    FIREBIRD_STORE(const FIREBIRD_STORE & rvalue);
-    FIREBIRD_STORE & operator=(const FIREBIRD_STORE & rvalue);
-
-    std::string version;
-    mutable std::string strError;
-    std::string db_server, db_database, db_user, db_password;
-    STG::ModuleSettings settings;
-    mutable IBPP::Database db;
-    mutable pthread_mutex_t mutex;
-    IBPP::TIL til;
-    IBPP::TLR tlr;
-    int schemaVersion;
-    STG::PluginLogger logger;
-
-    int SaveStat(const STG::UserStat & stat, const std::string & login, int year = 0, int month = 0) const;
-    int CheckVersion();
+class FIREBIRD_STORE : public STG::Store
+{
+    public:
+        FIREBIRD_STORE();
+        ~FIREBIRD_STORE() override;
+
+        int GetUsersList(std::vector<std::string> * usersList) const override;
+        int AddUser(const std::string & login) const override;
+        int DelUser(const std::string & login) const override;
+        int SaveUserStat(const STG::UserStat & stat, const std::string & login) const override;
+        int SaveUserConf(const STG::UserConf & conf, const std::string & login) const override;
+        int RestoreUserStat(STG::UserStat * stat, const std::string & login) const override;
+        int RestoreUserConf(STG::UserConf * conf, const std::string & login) const override;
+        int WriteUserChgLog(const std::string & login,
+                            const std::string & admLogin,
+                            uint32_t admIP,
+                            const std::string & paramName,
+                            const std::string & oldValue,
+                            const std::string & newValue,
+                            const std::string & message) const override;
+        int WriteUserConnect(const std::string & login, uint32_t ip) const override;
+        int WriteUserDisconnect(const std::string & login,
+                                const STG::DirTraff & up,
+                                const STG::DirTraff & down,
+                                const STG::DirTraff & sessionUp,
+                                const STG::DirTraff & sessionDown,
+                                double cash,
+                                double freeMb,
+                                const std::string & reason) const override;
+        int WriteDetailedStat(const STG::TraffStat & statTree,
+                              time_t lastStat,
+                              const std::string & login) const override;
+
+        int AddMessage(STG::Message * msg, const std::string & login) const override;
+        int EditMessage(const STG::Message & msg, const std::string & login) const override;
+        int GetMessage(uint64_t id, STG::Message * msg, const std::string & login) const override;
+        int DelMessage(uint64_t id, const std::string & login) const override;
+        int GetMessageHdrs(std::vector<STG::Message::Header> * hdrsList, const std::string & login) const override;
+
+        int SaveMonthStat(const STG::UserStat & stat, int month, int year, const std::string  & login) const override;
+
+        int GetAdminsList(std::vector<std::string> * adminsList) const override;
+        int SaveAdmin(const STG::AdminConf & ac) const override;
+        int RestoreAdmin(STG::AdminConf * ac, const std::string & login) const override;
+        int AddAdmin(const std::string & login) const override;
+        int DelAdmin(const std::string & login) const override;
+
+        int GetTariffsList(std::vector<std::string> * tariffsList) const override;
+        int AddTariff(const std::string & name) const override;
+        int DelTariff(const std::string & name) const override;
+        int SaveTariff(const STG::TariffData & td, const std::string & tariffName) const override;
+        int RestoreTariff(STG::TariffData * td, const std::string & tariffName) const override;
+
+        int GetCorpsList(std::vector<std::string> * corpsList) const override;
+        int SaveCorp(const STG::CorpConf & cc) const override;
+        int RestoreCorp(STG::CorpConf * cc, const std::string & name) const override;
+        int AddCorp(const std::string & name) const override;
+        int DelCorp(const std::string & name) const override;
+
+        inline void SetSettings(const STG::ModuleSettings & s) override { settings = s; }
+        int ParseSettings() override;
+
+        inline const std::string & GetStrError() const override { return strError; }
+
+        inline const std::string & GetVersion() const override { return version; }
+
+        int GetServicesList(std::vector<std::string> * servicesList) const override;
+        int SaveService(const STG::ServiceConf & sc) const override;
+        int RestoreService(STG::ServiceConf * sc, const std::string & name) const override;
+        int AddService(const std::string & name) const override;
+        int DelService(const std::string & name) const override;
+
+    private:
+        FIREBIRD_STORE(const FIREBIRD_STORE & rvalue);
+        FIREBIRD_STORE & operator=(const FIREBIRD_STORE & rvalue);
+
+        std::string version;
+        mutable std::string strError;
+        std::string db_server, db_database, db_user, db_password;
+        STG::ModuleSettings settings;
+        mutable IBPP::Database db;
+        mutable std::mutex m_mutex;
+        IBPP::TIL til;
+        IBPP::TLR tlr;
+        int schemaVersion;
+        STG::PluginLogger logger;
+
+        int SaveStat(const STG::UserStat & stat, const std::string & login, int year = 0, int month = 0) const;
+        int CheckVersion();

 };
 
 time_t ts2time_t(const IBPP::Timestamp & ts);
 };
 
 time_t ts2time_t(const IBPP::Timestamp & ts);