Stargazer (#6)

[stg.git] / projects / stargazer / main.cpp

diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp
index bcf7af777f2bec80e9b8c89a11a54bcf63a05159..acc826f71576374b499f0a2b5c5014859f9b2475 100644 (file)
--- a/projects/stargazer/main.cpp
+++ b/projects/stargazer/main.cpp
@@ -29,7 +29,7 @@
 #include "traffcounter_impl.h"
 #include "settings_impl.h"
 #include "pidfile.h"
 #include "traffcounter_impl.h"
 #include "settings_impl.h"
 #include "pidfile.h"

-#include "eventloop.h"
+#include "async_pool.h"

 #include "stg_timer.h"
 
 #include "stg/user.h"
 #include "stg_timer.h"
 
 #include "stg/user.h"


@@ -41,6 +41,7 @@
 
 #include <fstream>
 #include <vector>
 
 #include <fstream>
 #include <vector>

+#include <string>

 #include <set>
 #include <csignal>
 #include <cerrno>
 #include <set>
 #include <csignal>
 #include <cerrno>


@@ -55,10 +56,6 @@
 #include <sys/stat.h> // S_IRUSR
 #include <fcntl.h> // create
 
 #include <sys/stat.h> // S_IRUSR
 #include <fcntl.h> // create
 

-#ifdef DEBUG
-    #define NO_DAEMON  (1)
-#endif
-

 #define START_FILE "/._ST_ART_ED_"
 
 using STG::SettingsImpl;
 #define START_FILE "/._ST_ART_ED_"
 
 using STG::SettingsImpl;


@@ -155,13 +152,8 @@ int StartScriptExecuter(char*, int msgKey, int* msgID)
     return 0;
 }
 //-----------------------------------------------------------------------------
     return 0;
 }
 //-----------------------------------------------------------------------------

-#ifndef NO_DAEMON

 int ForkAndWait(const std::string& confDir)
 int ForkAndWait(const std::string& confDir)

-#else
-int ForkAndWait(const std::string&)
-#endif

 {
 {

-#ifndef NO_DAEMON

     const auto pid = fork();
     const auto startFile = confDir + START_FILE;
     unlink(startFile.c_str());
     const auto pid = fork();
     const auto startFile = confDir + START_FILE;
     unlink(startFile.c_str());


@@ -194,9 +186,9 @@ int ForkAndWait(const std::string&)
             exit(1);
             break;
     }
             exit(1);
             break;
     }

-#endif

     return 0;
 }
     return 0;
 }

+

 //-----------------------------------------------------------------------------
 void KillExecuters()
 {
 //-----------------------------------------------------------------------------
 void KillExecuters()
 {


@@ -208,6 +200,21 @@ void KillExecuters()
         ++pid;
     }
 }
         ++pid;
     }
 }

+
+void PrintHelp(const std::string& programName)
+{
+    std::cout << "Usage: " << programName << "[-h/--help] [-v/--version] [-f/--foreground] [<conf-dir-path>]\n"
+              << "\t --help, -h            - print this help;\n"
+              << "\t --version, -v         - print version;\n"
+              << "\t --foreground, -f      - do not go into background;\n"
+              << "\t <conf-dir-path>       - path to the directory where the configuration file is located.\n";
+}
+
+void PrintVersion(const std::string& programName)
+{
+    std::cout << programName << "\n"
+              << "Stargazer version" <<  " " << SERVER_VERSION << "\n";
+}

 //-----------------------------------------------------------------------------
 } // namespace anonymous
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 } // namespace anonymous
 //-----------------------------------------------------------------------------


@@ -223,7 +230,34 @@ int main(int argc, char* argv[])
         return 1;
     }
 
         return 1;
     }
 

-    SettingsImpl settings(argc == 2 ? argv[1] : "");
+    std::string path;
+    bool noDaemon(false);
+
+    if (argc == 1)
+        path = "";
+    else
+    {
+        for (int i = 1; i < argc; ++i)
+        {
+            const std::string arg(argv[i]);
+            if (arg == "--help" || arg == "-h")
+            {
+                PrintHelp(argv[0]);
+                return 0;
+            }
+            if (arg == "--version" || arg == "-v")
+            {
+                PrintVersion(argv[0]);
+                return 0;
+            }
+            if (arg == "--foreground" || arg == "-f")
+                noDaemon = true;
+            else
+                path = arg;
+        }
+    }
+
+    SettingsImpl settings(path);

 
     if (settings.ReadSettings())
     {
 
     if (settings.ReadSettings())
     {


@@ -236,14 +270,13 @@ int main(int argc, char* argv[])
         return -1;
     }
 
         return -1;
     }
 

-#ifndef NO_DAEMON
-    const auto startFile = settings.GetConfDir() + START_FILE;
-#endif
-
-    if (ForkAndWait(settings.GetConfDir()) < 0)
+    if (!noDaemon)

     {
     {

-        STG::Logger::get()("Fork error!");
-        return -1;
+        if (ForkAndWait(settings.GetConfDir()) < 0)
+        {
+            STG::Logger::get()("Fork error!");
+            return -1;
+        }

     }
 
     auto& WriteServLog = STG::Logger::get();
     }
 
     auto& WriteServLog = STG::Logger::get();


@@ -282,7 +315,7 @@ int main(int argc, char* argv[])
         return -1;
     }
 
         return -1;
     }
 

-    auto& loop = EVENT_LOOP::instance();
+    STG::AsyncPoolST::start();

 
     StoreLoader storeLoader(settings);
     if (storeLoader.load())
 
     StoreLoader storeLoader(settings);
     if (storeLoader.load())


@@ -292,13 +325,6 @@ int main(int argc, char* argv[])
         return -1;
     }
 
         return -1;
     }
 

-    if (loop.Start())
-    {
-        printfd(__FILE__, "Event loop not started.\n");
-        WriteServLog("Event loop not started.");
-        return -1;
-    }
-

     auto& store = storeLoader.get();
     WriteServLog("Storage plugin: %s. Loading successfull.", store.GetVersion().c_str());
 
     auto& store = storeLoader.get();
     WriteServLog("Storage plugin: %s. Loading successfull.", store.GetVersion().c_str());
 


@@ -328,9 +354,11 @@ int main(int argc, char* argv[])
     WriteServLog("Stg started successfully.");
     WriteServLog("+++++++++++++++++++++++++++++++++++++++++++++");
 
     WriteServLog("Stg started successfully.");
     WriteServLog("+++++++++++++++++++++++++++++++++++++++++++++");
 

-#ifndef NO_DAEMON
-    creat(startFile.c_str(), S_IRUSR);
-#endif
+    if (!noDaemon)
+    {
+        const auto startFile = settings.GetConfDir() + START_FILE;
+        creat(startFile.c_str(), S_IRUSR);
+    }

 
     bool running = true;
     while (running)
 
     bool running = true;
     while (running)


@@ -377,8 +405,7 @@ int main(int argc, char* argv[])
 
     manager.stop();
 
 
     manager.stop();
 

-    if (loop.Stop())
-        WriteServLog("Event loop not stopped.");
+    STG::AsyncPoolST::stop();

 
     if (!traffCnt.Stop())
         WriteServLog("Traffcounter: Stop successfull.");
 
     if (!traffCnt.Stop())
         WriteServLog("Traffcounter: Stop successfull.");