Check End-Of-Transmission read result

[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 ea2ec4f32a27436263cc3f0bbc1dbb214487d798..edba035927bac2e9dbdb7c0cd340898bea46ddf5 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store.h
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.h
@@ -35,15 +35,15 @@
 #include <vector>
 #include <map>
 
 #include <vector>
 #include <map>
 

-#include "base_store.h"
+#include "stg/store.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 5
 // Recommended DB version is 6 (support FreeMb logging on disconnects)
 #define DB_MIN_VERSION 5
 

-extern "C" BASE_STORE * GetStore();
+extern "C" STORE * GetStore();

 
 

-class POSTGRESQL_STORE : public BASE_STORE {
+class POSTGRESQL_STORE : public STORE {

 public:
     POSTGRESQL_STORE();
     virtual ~POSTGRESQL_STORE();
 public:
     POSTGRESQL_STORE();
     virtual ~POSTGRESQL_STORE();


@@ -72,7 +72,7 @@ public:
                             double cash,
                             double freeMb,
                             const std::string & reason) const;
                             double cash,
                             double freeMb,
                             const std::string & reason) const;

-    int WriteDetailedStat(const std::map<IP_DIR_PAIR, STAT_NODE> & statTree,
+    int WriteDetailedStat(const TRAFF_STAT & statTree,

                           time_t lastStat,
                           const std::string & login) const;
 
                           time_t lastStat,
                           const std::string & login) const;
 


@@ -121,6 +121,9 @@ public:
     inline const string & GetStrError() const { return strError; };
     inline const string & GetVersion() const { return versionString; };
 private:
     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;
     int StartTransaction() const;
     int CommitTransaction() const;
     int RollbackTransaction() const;


@@ -152,6 +155,7 @@ private:
     MODULE_SETTINGS settings;
     mutable pthread_mutex_t mutex;
     mutable int version;
     MODULE_SETTINGS settings;
     mutable pthread_mutex_t mutex;
     mutable int version;

+    int retries;

 
     PGconn * connection;
 };
 
     PGconn * connection;
 };