More stgTime cleanup.

[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 35551c5db1ecf24bd509fe06ad3c4cd1a78e4a1c..2146d66483f32dc9179122828cbe0b146584694d 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
@@ -38,27 +38,22 @@
  *
  */
 
  *
  */
 

-#include <string>
-#include <vector>
-
-#include <libpq-fe.h>
+#include "postgresql_store.h"

 
 

-#include "stg/module_settings.h"
-#include "stg/plugin_creator.h"

 #include "postgresql_store_utils.h"
 #include "postgresql_store.h"
 
 #include "postgresql_store_utils.h"
 #include "postgresql_store.h"
 

-namespace
-{
-PLUGIN_CREATOR<POSTGRESQL_STORE> pgsc;
-}
+#include "stg/common.h" // str2x, printfd
+
+#include <string>
+#include <vector>

 
 

-extern "C" STORE * GetStore();
+#include <libpq-fe.h>

 
 

-//-----------------------------------------------------------------------------
-STORE * GetStore()
+extern "C" STG::Store* GetStore()

 {
 {

-return pgsc.GetPlugin();
+    static POSTGRESQL_STORE plugin;
+    return &plugin;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -72,7 +67,7 @@ POSTGRESQL_STORE::POSTGRESQL_STORE()
       version(0),
       retries(3),
       connection(NULL),
       version(0),
       retries(3),
       connection(NULL),

-      logger(GetPluginLogger(GetStgLogger(), "store_postgresql"))
+      logger(STG::PluginLogger::get("store_postgresql"))

 {
 pthread_mutex_init(&mutex, NULL);
 }
 {
 pthread_mutex_init(&mutex, NULL);
 }


@@ -88,14 +83,13 @@ pthread_mutex_destroy(&mutex);
 //-----------------------------------------------------------------------------
 int POSTGRESQL_STORE::ParseSettings()
 {
 //-----------------------------------------------------------------------------
 int POSTGRESQL_STORE::ParseSettings()
 {

-std::vector<PARAM_VALUE>::iterator i;
-std::string s;
+std::vector<STG::ParamValue>::iterator i;

 
 for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
     {
     if (i->value.empty())
         continue;
 
 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();
     if (s == "server")
         {
         server = i->value.front();