*
*/
-#include <string>
-#include <vector>
-#include <algorithm>
+#include "postgresql_store.h"
+
+#include "stg/module_settings.h"
+#include "stg/plugin_creator.h"
#include <libpq-fe.h>
-#include "postgresql_store.h"
-#include "postgresql_store_utils.h"
-#include "module_settings.h"
+#include <string>
+#include <vector>
-class POSTGRESQL_STORE_CREATOR
+namespace
{
-public:
- POSTGRESQL_STORE_CREATOR()
- : pqStore(new POSTGRESQL_STORE())
- {
- };
- ~POSTGRESQL_STORE_CREATOR()
- {
- delete pqStore;
- };
- POSTGRESQL_STORE * GetStore() { return pqStore; };
-private:
- POSTGRESQL_STORE * pqStore;
-} pqStoreeCreator;
+PLUGIN_CREATOR<POSTGRESQL_STORE> pgsc;
+}
+
+extern "C" STORE * GetStore();
//-----------------------------------------------------------------------------
STORE * GetStore()
{
-return pqStoreeCreator.GetStore();
+return pgsc.GetPlugin();
}
//-----------------------------------------------------------------------------
POSTGRESQL_STORE::POSTGRESQL_STORE()
: versionString("postgresql_store v.1.3"),
+ strError(),
server("localhost"),
database("stargazer"),
user("stg"),
password("123456"),
+ clientEncoding("KOI8"),
+ settings(),
+ mutex(),
version(0),
- connection(NULL)
+ retries(3),
+ connection(NULL),
+ logger(GetPluginLogger(GetStgLogger(), "store_postgresql"))
{
pthread_mutex_init(&mutex, NULL);
}
int POSTGRESQL_STORE::ParseSettings()
{
std::vector<PARAM_VALUE>::iterator i;
-string s;
for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
{
- s = i->param;
- std::transform(s.begin(), s.end(), s.begin(), ToLower());
- if (s == "server")
- {
+ std::string param(ToLower(i->param));
+ if (param == "server")
server = *(i->value.begin());
- }
- if (s == "database")
- {
+ else if (param == "database")
database = *(i->value.begin());
- }
- if (s == "user")
- {
+ else if (param == "user")
user = *(i->value.begin());
- }
- if (s == "password")
- {
+ else if (param == "password")
password = *(i->value.begin());
- }
+ else if (param == "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";
{
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()))
//-----------------------------------------------------------------------------
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)
{
{
strError = PQerrorMessage(connection);
printfd(__FILE__, "POSTGRESQL_STORE::Reset(): '%s'\n", strError.c_str());
- return 1;
+ return -1;
}
return CheckVersion();