Merge branch 'master' into full-month-stats

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / stgconfig.cpp

diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
index 19d68f98da37c4a446f52dc7c1d599ba323ff325..ea71a117b7bb925c1e753d00cf3665d5aea1c962 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
@@ -56,12 +56,17 @@ return "Stg configurator v.0.08";
 }
 //-----------------------------------------------------------------------------
 STG_CONFIG::STG_CONFIG()
 }
 //-----------------------------------------------------------------------------
 STG_CONFIG::STG_CONFIG()

-    : nonstop(false),
+    : errorStr(),
+      stgConfigSettings(),
+      thread(),
+      nonstop(false),

       isRunning(false),
       isRunning(false),

+      config(),

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

+      settings(),

       stgSettings(NULL)
 {
 }
       stgSettings(NULL)
 {
 }


@@ -118,27 +123,22 @@ for (i = 0; i < 25; i++)
     if (!isRunning)
         break;
 
     if (!isRunning)
         break;
 

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

     }
 
     }
 

-//after 5 seconds waiting thread still running. now killing it

 if (isRunning)
 if (isRunning)

-    {
-    //TODO pthread_cancel()
-    if (pthread_kill(thread, SIGINT))
-        {
-        errorStr = "Cannot kill thread.";
-        printfd(__FILE__, "Cannot kill thread\n");
-        return -1;
-        }
-    printfd(__FILE__, "STG_CONFIG killed\n");
-    }
+    return -1;

 
 return 0;
 }
 //-----------------------------------------------------------------------------
 void * STG_CONFIG::Run(void * d)
 {
 
 return 0;
 }
 //-----------------------------------------------------------------------------
 void * STG_CONFIG::Run(void * d)
 {

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

 STG_CONFIG * stgConf = (STG_CONFIG *)d;
 stgConf->isRunning = true;
 
 STG_CONFIG * stgConf = (STG_CONFIG *)d;
 stgConf->isRunning = true;