X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/dd226cecb0cb5dad554ed3adf7bf60d2eb059a30..479b8853c2ab18c98926a9369a03888021e9b986:/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 35551c5d..ba478966 100644 --- a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp +++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp @@ -38,27 +38,19 @@ * */ +#include "postgresql_store.h" + +#include "stg/common.h" // str2x, printfd + #include #include #include -#include "stg/module_settings.h" -#include "stg/plugin_creator.h" -#include "postgresql_store_utils.h" -#include "postgresql_store.h" - -namespace -{ -PLUGIN_CREATOR pgsc; -} - -extern "C" STORE * GetStore(); - -//----------------------------------------------------------------------------- -STORE * GetStore() +extern "C" STG::Store* GetStore() { -return pgsc.GetPlugin(); + static POSTGRESQL_STORE plugin; + return &plugin; } //----------------------------------------------------------------------------- @@ -72,7 +64,7 @@ POSTGRESQL_STORE::POSTGRESQL_STORE() version(0), retries(3), connection(NULL), - logger(GetPluginLogger(GetStgLogger(), "store_postgresql")) + logger(STG::PluginLogger::get("store_postgresql")) { pthread_mutex_init(&mutex, NULL); } @@ -88,14 +80,13 @@ pthread_mutex_destroy(&mutex); //----------------------------------------------------------------------------- int POSTGRESQL_STORE::ParseSettings() { -std::vector::iterator i; -std::string s; +std::vector::iterator i; for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i) { if (i->value.empty()) continue; - s = ToLower(i->param); + std::string s = ToLower(i->param); if (s == "server") { server = i->value.front();