Merge branch 'master' into full-month-stats

[stg.git] / 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 d273803df0ec235536328fb95eae774e37b1a3e3..654de1467674cb79c352e0b2901d094a33d3b31e 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store.h
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.h
@@ -35,11 +35,12 @@
 #include <vector>
 #include <map>
 
-#include "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
+// Minimal DB version is 7
+// Recommended DB version is 7 (support full month stats)
+#define DB_MIN_VERSION 7
 
 extern "C" STORE * GetStore();
 
@@ -121,6 +122,9 @@ public:
     inline const string & GetStrError() const { return strError; };
     inline const string & GetVersion() const { return versionString; };
 private:
+    POSTGRESQL_STORE(const POSTGRESQL_STORE & rvalue);
+    POSTGRESQL_STORE & operator=(const POSTGRESQL_STORE & rvalue);
+
     int StartTransaction() const;
     int CommitTransaction() const;
     int RollbackTransaction() const;
@@ -152,8 +156,11 @@ private:
     MODULE_SETTINGS settings;
     mutable pthread_mutex_t mutex;
     mutable int version;
+    int retries;
 
     PGconn * connection;
+
+    PLUGIN_LOGGER logger;
 };
 
 extern const volatile time_t stgTime;