TEST_SETTINGS_LOCAL moved outside the namespace, more assertions added

[stg.git] / projects / stargazer / plugins / store / postgresql / postgresql_store.cpp

diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
index e316beafb87d68d4dceb9090b2830cced8793086..2210c9511a4965e4a124a9b217a9bc9d269d3169 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
@@ -22,7 +22,7 @@
  *  This file contains a realization of a base postgresql-storage plugin class
  *
  *  v. 1.3
  *  This file contains a realization of a base postgresql-storage plugin class
  *
  *  v. 1.3

- *  FreeMb logging on dosconnects added
+ *  FreeMb logging on disconnects added

  *
  *  v. 1.2
  *  Reconnection on faults added
  *
  *  v. 1.2
  *  Reconnection on faults added


@@ -46,7 +46,7 @@
 
 #include "postgresql_store.h"
 #include "postgresql_store_utils.h"
 
 #include "postgresql_store.h"
 #include "postgresql_store_utils.h"

-#include "base_settings.h"
+#include "stg/module_settings.h"

 
 class POSTGRESQL_STORE_CREATOR
 {
 
 class POSTGRESQL_STORE_CREATOR
 {


@@ -65,20 +65,22 @@ private:
 } pqStoreeCreator;
 
 //-----------------------------------------------------------------------------
 } pqStoreeCreator;
 
 //-----------------------------------------------------------------------------

-BASE_STORE * GetStore()
+STORE * GetStore()

 {
 return pqStoreeCreator.GetStore();
 }
 
 //-----------------------------------------------------------------------------
 POSTGRESQL_STORE::POSTGRESQL_STORE()
 {
 return pqStoreeCreator.GetStore();
 }
 
 //-----------------------------------------------------------------------------
 POSTGRESQL_STORE::POSTGRESQL_STORE()

-    : connection(NULL)
+    : versionString("postgresql_store v.1.3"),
+      server("localhost"),
+      database("stargazer"),
+      user("stg"),
+      password("123456"),
+      version(0),
+      retries(3),
+      connection(NULL)

 {
 {

-server = "localhost";
-database = "stargazer";
-user = "stg";
-password = "123456";
-versionString = "postgresql_store v.1.3";

 pthread_mutex_init(&mutex, NULL);
 }
 //-----------------------------------------------------------------------------
 pthread_mutex_init(&mutex, NULL);
 }
 //-----------------------------------------------------------------------------


@@ -116,6 +118,15 @@ for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
         {
         password = *(i->value.begin());
         }
         {
         password = *(i->value.begin());
         }

+    if (s == "retries")
+        {
+        if (str2x(*(i->value.begin()), retries))
+            {
+            strError = "Invalid 'retries' value";
+            printfd(__FILE__, "POSTGRESQL_STORE::ParseSettings(): '%s'\n", strError.c_str());
+            return -1;
+            }
+        }

     }
 
 clientEncoding = "KOI8";
     }
 
 clientEncoding = "KOI8";


@@ -137,7 +148,8 @@ if (PQstatus(connection) != CONNECTION_OK)
     {
     strError = PQerrorMessage(connection);
     printfd(__FILE__, "POSTGRESQL_STORE::Connect(): '%s'\n", strError.c_str());
     {
     strError = PQerrorMessage(connection);
     printfd(__FILE__, "POSTGRESQL_STORE::Connect(): '%s'\n", strError.c_str());

-    return 1;
+    // Will try to connect later
+    return 0;

     }
 
 if (PQsetClientEncoding(connection, clientEncoding.c_str()))
     }
 
 if (PQsetClientEncoding(connection, clientEncoding.c_str()))


@@ -152,7 +164,12 @@ return CheckVersion();
 //-----------------------------------------------------------------------------
 int POSTGRESQL_STORE::Reset() const
 {
 //-----------------------------------------------------------------------------
 int POSTGRESQL_STORE::Reset() const
 {

-PQreset(connection);
+for (int i = 0; i < retries && PQstatus(connection) != CONNECTION_OK; ++i)
+    {
+    struct timespec ts = {1, 0};
+    nanosleep(&ts, NULL);
+    PQreset(connection);
+    }

 
 if (PQstatus(connection) != CONNECTION_OK)
     {
 
 if (PQstatus(connection) != CONNECTION_OK)
     {


@@ -165,7 +182,7 @@ if (PQsetClientEncoding(connection, clientEncoding.c_str()))
     {
     strError = PQerrorMessage(connection);
     printfd(__FILE__, "POSTGRESQL_STORE::Reset(): '%s'\n", strError.c_str());
     {
     strError = PQerrorMessage(connection);
     printfd(__FILE__, "POSTGRESQL_STORE::Reset(): '%s'\n", strError.c_str());

-    return 1;
+    return -1;

     }
 
 return CheckVersion();
     }
 
 return CheckVersion();