X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/a3a0464acbfeba90954fb4b7c583657cdd15ee5c..91002d861d8e0729e84f9ef65a19001d515d7dbe:/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp?ds=sidebyside

diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
index 0acc6e81..ca6b8d21 100644
--- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp
@@ -1,18 +1,37 @@
-#include <unistd.h>
+/*
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
-#include <csignal>
-#include <algorithm>
+/*
+ *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
+ */
 
-#include "stg/tariffs.h"
-#include "stg/admins.h"
-#include "stg/users.h"
-#include "stg/plugin_creator.h"
 #include "stgconfig.h"
 
+#include "stg/plugin_creator.h"
+#include "stg/common.h"
+
+#include <algorithm>
+#include <csignal>
+
+#include <unistd.h>
+
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-PLUGIN_CREATOR<STG_CONFIG> stgc;
+static PLUGIN_CREATOR<STG_CONFIG> stgc;
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
@@ -20,7 +39,7 @@ int STG_CONFIG_SETTINGS::ParseSettings(const MODULE_SETTINGS & s)
 {
 int p;
 PARAM_VALUE pv;
-vector<PARAM_VALUE>::const_iterator pvi;
+std::vector<PARAM_VALUE>::const_iterator pvi;
 ///////////////////////////
 pv.param = "Port";
 pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv);
@@ -36,7 +55,7 @@ if (ParseIntInRange(pvi->value[0], 2, 65535, &p))
     printfd(__FILE__, "%s\n", errorStr.c_str());
     return -1;
     }
-port = p;
+port = static_cast<uint16_t>(p);
 
 return 0;
 }
@@ -50,19 +69,15 @@ return stgc.GetPlugin();
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-const std::string STG_CONFIG::GetVersion() const
-{
-return "Stg configurator v.0.08";
-}
-//-----------------------------------------------------------------------------
 STG_CONFIG::STG_CONFIG()
-    : nonstop(false),
+    : errorStr(),
+      stgConfigSettings(),
+      thread(),
+      nonstop(false),
       isRunning(false),
-      users(NULL),
-      admins(NULL),
-      tariffs(NULL),
-      store(NULL),
-      stgSettings(NULL)
+      logger(GetPluginLogger(GetStgLogger(), "conf_sg")),
+      config(logger),
+      settings()
 {
 }
 //-----------------------------------------------------------------------------
@@ -82,11 +97,6 @@ if (isRunning)
 nonstop = true;
 
 config.SetPort(stgConfigSettings.GetPort());
-config.SetAdmins(admins);
-config.SetUsers(users);
-config.SetTariffs(tariffs);
-config.SetStgSettings(stgSettings);
-config.SetStore(store);
 
 if (config.Prepare())
     {
@@ -98,6 +108,7 @@ if (pthread_create(&thread, NULL, Run, this))
     {
     errorStr = "Cannot create thread.";
     printfd(__FILE__, "Cannot create thread\n");
+    logger("Cannot create thread.");
     return -1;
     }
 errorStr = "";
@@ -112,37 +123,31 @@ if (!isRunning)
 config.Stop();
 
 //5 seconds to thread stops itself
-int i;
-for (i = 0; i < 25; i++)
+for (int i = 0; i < 25; i++)
     {
     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)
-    {
-    //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)
 {
-STG_CONFIG * stgConf = (STG_CONFIG *)d;
+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+
+STG_CONFIG * stgConf = static_cast<STG_CONFIG *>(d);
 stgConf->isRunning = true;
 
-stgConf->config.Run(&stgConf->config);
+stgConf->config.Run();
 
 stgConf->isRunning = false;
 return NULL;