Return correct core if stop fails

[stg.git] / projects / stargazer / plugins / configuration / rpcconfig / rpcconfig.cpp

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
index 8afbd9cdda8f1bf8acab5880f1c5e625956a495e..d3fdba55576f526cd4f292753fa86ffc5553e870 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.cpp
@@ -1,5 +1,3 @@
-#include <unistd.h> // TODO: usleep
-

 #include <cstdlib>
 #include <csignal>
 
 #include <cstdlib>
 #include <csignal>
 


@@ -10,6 +8,7 @@
 #include "stg/admin.h"
 #include "stg/module_settings.h"
 #include "stg/settings.h"
 #include "stg/admin.h"
 #include "stg/module_settings.h"
 #include "stg/settings.h"

+#include "stg/plugin_creator.h"

 
 #include "rpcconfig.h"
 #include "info_methods.h"
 
 #include "rpcconfig.h"
 #include "info_methods.h"


@@ -18,27 +17,7 @@
 #include "admins_methods.h"
 #include "messages_methods.h"
 
 #include "admins_methods.h"
 #include "messages_methods.h"
 

-class RPC_CONFIG_CREATOR {
-private:
-    RPC_CONFIG * rpcconfig;
-
-public:
-    RPC_CONFIG_CREATOR()
-        : rpcconfig(new RPC_CONFIG())
-        {
-        }
-    ~RPC_CONFIG_CREATOR()
-        {
-        delete rpcconfig;
-        }
-
-    RPC_CONFIG * GetPlugin()
-        {
-        return rpcconfig;
-        }
-};
-
-RPC_CONFIG_CREATOR rpcc;
+PLUGIN_CREATOR<RPC_CONFIG> rpcc;

 
 RPC_CONFIG_SETTINGS::RPC_CONFIG_SETTINGS()
     : errorStr(),
 
 RPC_CONFIG_SETTINGS::RPC_CONFIG_SETTINGS()
     : errorStr(),


@@ -94,14 +73,21 @@ return rpcc.GetPlugin();
 }
 
 RPC_CONFIG::RPC_CONFIG()
 }
 
 RPC_CONFIG::RPC_CONFIG()

-    : users(NULL),
+    : errorStr(),
+      rpcConfigSettings(),
+      users(NULL),

       admins(NULL),
       tariffs(NULL),
       store(NULL),
       admins(NULL),
       tariffs(NULL),
       store(NULL),

+      settings(),
+      rpcRegistry(),

       rpcServer(NULL),
       running(false),
       stopped(true),
       rpcServer(NULL),
       running(false),
       stopped(true),

-      dayFee(0)
+      tid(),
+      cookies(),
+      dayFee(0),
+      dirNames()

 {
 }
 
 {
 }
 


@@ -152,7 +138,10 @@ int RPC_CONFIG::Stop()
 {
 running = false;
 for (int i = 0; i < 5 && !stopped; ++i)
 {
 running = false;
 for (int i = 0; i < 5 && !stopped; ++i)

-    usleep(200000);
+    {
+    struct timespec ts = {0, 200000000};
+    nanosleep(&ts, NULL);
+    }

 //rpcServer->terminate();
 if (!stopped)
     {
 //rpcServer->terminate();
 if (!stopped)
     {


@@ -162,9 +151,13 @@ if (!stopped)
         printfd(__FILE__, "Failed to kill thread\n");
         }
     for (int i = 0; i < 25 && !stopped; ++i)
         printfd(__FILE__, "Failed to kill thread\n");
         }
     for (int i = 0; i < 25 && !stopped; ++i)

-        usleep(200000);
+        {
+        struct timespec ts = {0, 200000000};
+        nanosleep(&ts, NULL);
+        }

     if (!stopped)
         {
     if (!stopped)
         {

+        running = true;

         printfd(__FILE__, "Failed to stop RPC thread\n");
         errorStr = "Failed to stop RPC thread";
         return -1;
         printfd(__FILE__, "Failed to stop RPC thread\n");
         errorStr = "Failed to stop RPC thread";
         return -1;


@@ -179,6 +172,10 @@ return 0;
 
 void * RPC_CONFIG::Run(void * rc)
 {
 
 void * RPC_CONFIG::Run(void * rc)
 {

+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+

 RPC_CONFIG * config = static_cast<RPC_CONFIG *>(rc);
 
 config->stopped = false;
 RPC_CONFIG * config = static_cast<RPC_CONFIG *>(rc);
 
 config->stopped = false;


@@ -223,7 +220,7 @@ bool RPC_CONFIG::CheckAdmin(const std::string & login,
 {
 ADMIN * admin = NULL;
 
 {
 ADMIN * admin = NULL;
 

-if (!admins->AdminCorrect(login, password, &admin))
+if (!admins->Correct(login, password, &admin))

     {
     return true;
     }
     {
     return true;
     }