Cosmetic changes and possible sgconfig hang's fix

[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 4bf72c0e951f051b904768f643d07833c4b29d56..19e3efec8941797e64a64f181b607f5bb056f47a 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
@@ -44,30 +44,17 @@
 
 #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
-{
-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> pqStoreeCreator;

 
 //-----------------------------------------------------------------------------
 STORE * GetStore()
 {
 
 //-----------------------------------------------------------------------------
 STORE * GetStore()
 {

-return pqStoreeCreator.GetStore();
+return pqStoreeCreator.GetPlugin();

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


@@ -78,8 +65,8 @@ POSTGRESQL_STORE::POSTGRESQL_STORE()
       user("stg"),
       password("123456"),
       version(0),
       user("stg"),
       password("123456"),
       version(0),

-      connection(NULL),
-      retries(3)
+      retries(3),
+      connection(NULL)

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