X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/1bf5ae378079e212f6918d09d87dec5420a0d6ec..68ff250b88c43acf959cdf80eb9c3a519157a3f7:/projects/stargazer/plugins/store/postgresql/postgresql_store.h diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store.h b/projects/stargazer/plugins/store/postgresql/postgresql_store.h index a731fbf9..72a2c22c 100644 --- a/projects/stargazer/plugins/store/postgresql/postgresql_store.h +++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.h @@ -33,17 +33,15 @@ #include #include -#include -#include "base_store.h" +#include "stg/store.h" +#include "stg/logger.h" // Minimal DB version is 5 // Recommended DB version is 6 (support FreeMb logging on disconnects) #define DB_MIN_VERSION 5 -extern "C" BASE_STORE * GetStore(); - -class POSTGRESQL_STORE : public BASE_STORE { +class POSTGRESQL_STORE : public STORE { public: POSTGRESQL_STORE(); virtual ~POSTGRESQL_STORE(); @@ -72,7 +70,7 @@ public: double cash, double freeMb, const std::string & reason) const; - int WriteDetailedStat(const std::map & statTree, + int WriteDetailedStat(const TRAFF_STAT & statTree, time_t lastStat, const std::string & login) const; @@ -96,7 +94,7 @@ public: // Tariffs int GetTariffsList(std::vector * tariffsList) const; int AddTariff(const std::string & name) const; - int DelTariff(const string & name) const; + int DelTariff(const std::string & name) const; int SaveTariff(const TARIFF_DATA & td, const std::string & tariffName) const; int RestoreTariff(TARIFF_DATA * td, const std::string & tariffName) const; @@ -115,24 +113,14 @@ public: int DelService(const std::string & name) const; // Settings - inline void SetSettings(const MODULE_SETTINGS & s) { settings = s; }; + inline void SetSettings(const MODULE_SETTINGS & s) { settings = s; } int ParseSettings(); - inline const string & GetStrError() const { return strError; }; - inline const string & GetVersion() const { return versionString; }; + inline const std::string & GetStrError() const { return strError; } + inline const std::string & GetVersion() const { return versionString; } private: - std::string versionString; - mutable std::string strError; - std::string server; - std::string database; - std::string user; - std::string password; - std::string clientEncoding; - MODULE_SETTINGS settings; - mutable pthread_mutex_t mutex; - mutable int version; - - PGconn * connection; + POSTGRESQL_STORE(const POSTGRESQL_STORE & rvalue); + POSTGRESQL_STORE & operator=(const POSTGRESQL_STORE & rvalue); int StartTransaction() const; int CommitTransaction() const; @@ -140,8 +128,8 @@ private: int EscapeString(std::string & value) const; - std::string Int2TS(uint32_t value) const; - uint32_t TS2Int(const std::string & value) const; + std::string Int2TS(time_t value) const; + time_t TS2Int(const std::string & value) const; int SaveStat(const USER_STAT & stat, const std::string & login, int year = 0, int month = 0) const; @@ -154,9 +142,22 @@ private: int Connect(); int Reset() const; int CheckVersion() const; -}; -extern const volatile time_t stgTime; + std::string versionString; + mutable std::string strError; + std::string server; + std::string database; + std::string user; + std::string password; + std::string clientEncoding; + MODULE_SETTINGS settings; + mutable pthread_mutex_t mutex; + mutable int version; + int retries; -#endif //POSTGRESQL_STORE_H + PGconn * connection; + PLUGIN_LOGGER logger; +}; + +#endif //POSTGRESQL_STORE_H