X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/7c89c05d7fb37ff6cd90eeab811ef812c03218ec..7da963e5f936a329b63c308e4031b59390f42a92:/projects/stargazer/plugins/store/mysql/mysql_store.h

diff --git a/projects/stargazer/plugins/store/mysql/mysql_store.h b/projects/stargazer/plugins/store/mysql/mysql_store.h
index d0d4f70d..4a492b38 100644
--- a/projects/stargazer/plugins/store/mysql/mysql_store.h
+++ b/projects/stargazer/plugins/store/mysql/mysql_store.h
@@ -10,14 +10,14 @@
 #include <mysql/mysql.h>
 
 #include <string>
+#include <vector>
+#include <map>
 
 #include "stg/module_settings.h"
 #include "stg/store.h"
 #include "stg/user_traff.h"
+#include "stg/logger.h"
 
-using namespace std;
-//-----------------------------------------------------------------------------
-extern "C" STORE * GetStore();
 //-----------------------------------------------------------------------------
 class MYSQL_STORE_SETTINGS
 {
@@ -25,12 +25,12 @@ public:
     MYSQL_STORE_SETTINGS();
     virtual ~MYSQL_STORE_SETTINGS() {}
     virtual int ParseSettings(const MODULE_SETTINGS & s);
-    virtual const string & GetStrError() const { return errorStr; }
+    virtual const std::string & GetStrError() const { return errorStr; }
 
-    const string & GetDBUser() const { return dbUser; }
-    const string & GetDBPassword() const { return dbPass; }
-    const string & GetDBHost() const { return dbHost; }
-    const string & GetDBName() const { return dbName; }
+    const std::string & GetDBUser() const { return dbUser; }
+    const std::string & GetDBPassword() const { return dbPass; }
+    const std::string & GetDBHost() const { return dbHost; }
+    const std::string & GetDBName() const { return dbName; }
 
 private:
     MYSQL_STORE_SETTINGS(const MYSQL_STORE_SETTINGS & rvalue);
@@ -38,15 +38,15 @@ private:
 
     const MODULE_SETTINGS * settings;
 
-    int     ParseParam(const vector<PARAM_VALUE> & moduleParams, 
-                       const string & name, string & result);
+    int     ParseParam(const std::vector<PARAM_VALUE> & moduleParams, 
+                       const std::string & name, std::string & result);
 
-    string  errorStr;
+    std::string  errorStr;
 
-    string  dbUser;
-    string  dbPass;
-    string  dbName;
-    string  dbHost;
+    std::string  dbUser;
+    std::string  dbPass;
+    std::string  dbName;
+    std::string  dbHost;
 };
 //-----------------------------------------------------------------------------
 class MYSQL_STORE: public STORE
@@ -54,25 +54,25 @@ class MYSQL_STORE: public STORE
 public:
     MYSQL_STORE();
     virtual ~MYSQL_STORE() {}
-    virtual const string & GetStrError() const { return errorStr; }
+    virtual const std::string & GetStrError() const { return errorStr; }
 
     //User
-    virtual int GetUsersList(vector<string> * usersList) const;
-    virtual int AddUser(const string & login) const;
-    virtual int DelUser(const string & login) const;
-    virtual int SaveUserStat(const USER_STAT & stat, const string & login) const;
-    virtual int SaveUserConf(const USER_CONF & conf, const string & login) const;
-    virtual int RestoreUserStat(USER_STAT * stat, const string & login) const;
-    virtual int RestoreUserConf(USER_CONF * conf, const string & login) const;
-    virtual int WriteUserChgLog(const string & login,
-                                const string & admLogin,
+    virtual int GetUsersList(std::vector<std::string> * usersList) const;
+    virtual int AddUser(const std::string & login) const;
+    virtual int DelUser(const std::string & login) const;
+    virtual int SaveUserStat(const USER_STAT & stat, const std::string & login) const;
+    virtual int SaveUserConf(const USER_CONF & conf, const std::string & login) const;
+    virtual int RestoreUserStat(USER_STAT * stat, const std::string & login) const;
+    virtual int RestoreUserConf(USER_CONF * conf, const std::string & login) const;
+    virtual int WriteUserChgLog(const std::string & login,
+                                const std::string & admLogin,
                                 uint32_t       admIP,
-                                const string & paramName,
-                                const string & oldValue,
-                                const string & newValue,
-                                const string & message = "") const;
-    virtual int WriteUserConnect(const string & login, uint32_t ip) const;
-    virtual int WriteUserDisconnect(const string & login,
+                                const std::string & paramName,
+                                const std::string & oldValue,
+                                const std::string & newValue,
+                                const std::string & message = "") const;
+    virtual int WriteUserConnect(const std::string & login, uint32_t ip) const;
+    virtual int WriteUserDisconnect(const std::string & login,
                                     const DIR_TRAFF & up,
                                     const DIR_TRAFF & down,
                                     const DIR_TRAFF & sessionUp,
@@ -81,66 +81,70 @@ public:
                                     double freeMb,
                                     const std::string & reason) const;
 
-    virtual int WriteDetailedStat(const map<IP_DIR_PAIR, STAT_NODE> & statTree,
+    virtual int WriteDetailedStat(const std::map<IP_DIR_PAIR, STAT_NODE> & statTree,
                                   time_t lastStat,
-                                  const string & login) const;
+                                  const std::string & login) const;
 
-    virtual int AddMessage(STG_MSG * msg, const string & login) const;
-    virtual int EditMessage(const STG_MSG & msg, const string & login) const;
-    virtual int GetMessage(uint64_t id, STG_MSG * msg, const string & login) const;
-    virtual int DelMessage(uint64_t id, const string & login) const;
-    virtual int GetMessageHdrs(vector<STG_MSG_HDR> * hdrsList, const string & login) const;
+    virtual int AddMessage(STG_MSG * msg, const std::string & login) const;
+    virtual int EditMessage(const STG_MSG & msg, const std::string & login) const;
+    virtual int GetMessage(uint64_t id, STG_MSG * msg, const std::string & login) const;
+    virtual int DelMessage(uint64_t id, const std::string & login) const;
+    virtual int GetMessageHdrs(std::vector<STG_MSG_HDR> * hdrsList, const std::string & login) const;
 
-    virtual int SaveMonthStat(const USER_STAT & stat, int month, int year, const string & login) const;
+    virtual int SaveMonthStat(const USER_STAT & stat, int month, int year, const std::string & login) const;
 
     //Admin
-    virtual int GetAdminsList(vector<string> * adminsList) const;
-    virtual int AddAdmin(const string & login) const;
-    virtual int DelAdmin(const string & login) const;
-    virtual int RestoreAdmin(ADMIN_CONF * ac, const string & login) const;
+    virtual int GetAdminsList(std::vector<std::string> * adminsList) const;
+    virtual int AddAdmin(const std::string & login) const;
+    virtual int DelAdmin(const std::string & login) const;
+    virtual int RestoreAdmin(ADMIN_CONF * ac, const std::string & login) const;
     virtual int SaveAdmin(const ADMIN_CONF & ac) const;
 
     //Tariff
-    virtual int GetTariffsList(vector<string> * tariffsList) const;
-    virtual int AddTariff(const string & name) const;
-    virtual int DelTariff(const string & name) const;
-    virtual int SaveTariff(const TARIFF_DATA & td, const string & tariffName) const;
-    virtual int RestoreTariff(TARIFF_DATA * td, const string & tariffName) const;
+    virtual int GetTariffsList(std::vector<std::string> * tariffsList) const;
+    virtual int AddTariff(const std::string & name) const;
+    virtual int DelTariff(const std::string & name) const;
+    virtual int SaveTariff(const TARIFF_DATA & td, const std::string & tariffName) const;
+    virtual int RestoreTariff(TARIFF_DATA * td, const std::string & tariffName) const;
 
     //Corparation
-    virtual int GetCorpsList(vector<string> *) const {return 0;};
-    virtual int SaveCorp(const CORP_CONF &) const {return 0;};
-    virtual int RestoreCorp(CORP_CONF *, const string &) const {return 0;};
-    virtual int AddCorp(const string &) const {return 0;};
-    virtual int DelCorp(const string &) const {return 0;};
+    virtual int GetCorpsList(std::vector<std::string> *) const {return 0;}
+    virtual int SaveCorp(const CORP_CONF &) const {return 0;}
+    virtual int RestoreCorp(CORP_CONF *, const std::string &) const {return 0;}
+    virtual int AddCorp(const std::string &) const {return 0;}
+    virtual int DelCorp(const std::string &) const {return 0;}
 
     // Services
-    virtual int GetServicesList(vector<string> *) const {return 0;};
-    virtual int SaveService(const SERVICE_CONF &) const {return 0;};
-    virtual int RestoreService(SERVICE_CONF *, const string &) const {return 0;};
-    virtual int AddService(const string &) const {return 0;};
-    virtual int DelService(const string &) const {return 0;};
+    virtual int GetServicesList(std::vector<std::string> *) const {return 0;}
+    virtual int SaveService(const SERVICE_CONF &) const {return 0;}
+    virtual int RestoreService(SERVICE_CONF *, const std::string &) const {return 0;}
+    virtual int AddService(const std::string &) const {return 0;}
+    virtual int DelService(const std::string &) const {return 0;}
 
     virtual void            SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     virtual int             ParseSettings();
-    virtual const string &  GetVersion() const { return version; }
+    virtual const std::string &  GetVersion() const { return version; }
 
 private:
     MYSQL_STORE(const MYSQL_STORE & rvalue);
     MYSQL_STORE & operator=(const MYSQL_STORE & rvalue);
 
-    virtual int WriteLogString(const string & str, const string & login) const;
-    int GetAllParams(vector<string> * ParamList, const string & table, const string & name) const;
+    virtual int WriteLogString(const std::string & str, const std::string & login) const;
+    int GetAllParams(std::vector<std::string> * ParamList, const std::string & table, const std::string & name) const;
     int CheckAllTables(MYSQL * sock);
-    bool IsTablePresent(const string & str,MYSQL * sock);
-    mutable string          errorStr;
+    int MakeUpdates(MYSQL * sock);
+    bool IsTablePresent(const std::string & str,MYSQL * sock);
+    mutable std::string          errorStr;
     int                        MysqlQuery(const char* sQuery,MYSQL * sock) const;
     int                     MysqlGetQuery(const char * Query,MYSQL * & sock) const;
     int                     MysqlSetQuery(const char * Query) const;
     MYSQL  *                MysqlConnect() const ;
-    string                  version;
+    std::string                  version;
     MYSQL_STORE_SETTINGS    storeSettings;
     MODULE_SETTINGS         settings;
+    int                     schemaVersion;
+
+    PLUGIN_LOGGER           logger;
 };
 //-----------------------------------------------------------------------------