git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ticket 37. The true parameter changed to false in ensure_equals()
[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 fd0ebf5e13904ed956d095c14d22ae9957254f1f..35551c5db1ecf24bd509fe06ad3c4cd1a78e4a1c 100644
(file)
--- a/
projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
+++ b/
projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
@@
-40,34
+40,25
@@
#include <string>
#include <vector>
#include <string>
#include <vector>
-#include <algorithm>
#include <libpq-fe.h>
#include <libpq-fe.h>
-#include "postgresql_store.h"
-#include "postgresql_store_utils.h"
#include "stg/module_settings.h"
#include "stg/module_settings.h"
+#include "stg/plugin_creator.h"
+#include "postgresql_store_utils.h"
+#include "postgresql_store.h"
-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()
{
//-----------------------------------------------------------------------------
STORE * GetStore()
{
-return p
qStoreeCreator.GetStore
();
+return p
gsc.GetPlugin
();
}
//-----------------------------------------------------------------------------
}
//-----------------------------------------------------------------------------
@@
-77,8
+68,11
@@
POSTGRESQL_STORE::POSTGRESQL_STORE()
database("stargazer"),
user("stg"),
password("123456"),
database("stargazer"),
user("stg"),
password("123456"),
+ clientEncoding("KOI8"),
version(0),
version(0),
- connection(NULL)
+ retries(3),
+ connection(NULL),
+ logger(GetPluginLogger(GetStgLogger(), "store_postgresql"))
{
pthread_mutex_init(&mutex, NULL);
}
{
pthread_mutex_init(&mutex, NULL);
}
@@
-95,27
+89,37
@@
pthread_mutex_destroy(&mutex);
int POSTGRESQL_STORE::ParseSettings()
{
std::vector<PARAM_VALUE>::iterator i;
int POSTGRESQL_STORE::ParseSettings()
{
std::vector<PARAM_VALUE>::iterator i;
-string s;
+st
d::st
ring s;
for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
{
for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
{
- s = i->param;
- std::transform(s.begin(), s.end(), s.begin(), ToLower());
+ if (i->value.empty())
+ continue;
+ s = ToLower(i->param);
if (s == "server")
{
if (s == "server")
{
- server =
*(i->value.begin()
);
+ server =
i->value.front(
);
}
if (s == "database")
{
}
if (s == "database")
{
- database =
*(i->value.begin()
);
+ database =
i->value.front(
);
}
if (s == "user")
{
}
if (s == "user")
{
- user =
*(i->value.begin()
);
+ user =
i->value.front(
);
}
if (s == "password")
{
}
if (s == "password")
{
- password = *(i->value.begin());
+ password = i->value.front();
+ }
+ if (s == "retries")
+ {
+ if (str2x(i->value.front(), retries))
+ {
+ strError = "Invalid 'retries' value";
+ printfd(__FILE__, "POSTGRESQL_STORE::ParseSettings(): '%s'\n", strError.c_str());
+ return -1;
+ }
}
}
}
}
@@
-138,7
+142,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()))
@@
-153,7
+158,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)
{
@@
-166,7
+176,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();
@@
-224,6
+234,8
@@
if (CommitTransaction())
return -1;
}
return -1;
}
+logger("POSTGRESQL_STORE: Current DB schema version: %d", version);
+
return 0;
}
//-----------------------------------------------------------------------------
return 0;
}
//-----------------------------------------------------------------------------