'retries' parameter added to PostgreSQL storage plugin

diff --git a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_postgresql.conf b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_postgresql.conf
index 86c76f440b69fd078b8a3372f811c803567456fd..5132c8fca0bd4c1c0d5341ec165c1c7218861d9f 100644 (file)
--- a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_postgresql.conf
+++ b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_postgresql.conf
@@ -22,4 +22,10 @@
     # Value: any, supported by database
     # Default: 123456
     password = 123456
-</StoreModule>
\ No newline at end of file
+
+    # Number of tries to reconnect
+    # Parameter: optional
+    # Value: positive integer
+    # Default: 3
+    # retries = 3
+</StoreModule>

diff --git a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_postgresql.conf b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_postgresql.conf
index 86c76f440b69fd078b8a3372f811c803567456fd..5132c8fca0bd4c1c0d5341ec165c1c7218861d9f 100644 (file)
--- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_postgresql.conf
+++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_postgresql.conf
@@ -22,4 +22,10 @@
     # Value: any, supported by database
     # Default: 123456
     password = 123456
-</StoreModule>
\ No newline at end of file
+
+    # Number of tries to reconnect
+    # Parameter: optional
+    # Value: positive integer
+    # Default: 3
+    # retries = 3
+</StoreModule>

diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
index fd0ebf5e13904ed956d095c14d22ae9957254f1f..4bf72c0e951f051b904768f643d07833c4b29d56 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
@@ -78,7 +78,8 @@ POSTGRESQL_STORE::POSTGRESQL_STORE()
       user("stg"),
       password("123456"),
       version(0),
-      connection(NULL)
+      connection(NULL),
+      retries(3)
 {
 pthread_mutex_init(&mutex, NULL);
 }
@@ -117,6 +118,15 @@ for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
         {
         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";
@@ -138,7 +148,8 @@ if (PQstatus(connection) != CONNECTION_OK)
     {
     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()))
@@ -153,7 +164,12 @@ return CheckVersion();
 //-----------------------------------------------------------------------------
 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)
     {
@@ -166,7 +182,7 @@ if (PQsetClientEncoding(connection, clientEncoding.c_str()))
     {
     strError = PQerrorMessage(connection);
     printfd(__FILE__, "POSTGRESQL_STORE::Reset(): '%s'\n", strError.c_str());
-    return 1;
+    return -1;
     }
 
 return CheckVersion();

diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store.h b/projects/stargazer/plugins/store/postgresql/postgresql_store.h
index a32b155eb69448229685b4d79085aba5a6b34f24..8169137e4d6776de2394ce66266d443dcb047ab1 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store.h
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.h
@@ -152,6 +152,7 @@ private:
     MODULE_SETTINGS settings;
     mutable pthread_mutex_t mutex;
     mutable int version;
+    int retries;
 
     PGconn * connection;
 };