version 0.2.14

[fms.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 17d6b67..c2c499f 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,6 +5,8 @@
 #include <ctime>\r
 #include <csignal>\r
 #include <iostream>\r
+#include <cstring>\r
+#include <cstdlib>\r
 \r
 #ifdef _WIN32\r
        #include "../include/fmsservice.h"\r
@@ -19,6 +21,8 @@
 int main(int argc, char *argv[])\r
 {\r
 \r
+       bool daemon=false;\r
+\r
        #ifdef XMEM\r
                xmem_disable_print();\r
        #endif\r
@@ -30,6 +34,7 @@ int main(int argc, char *argv[])
                if(argv[1] && strncmp(argv[1],"-d",2)==0)\r
                {\r
                        Daemonize();\r
+                       daemon=true;\r
                }\r
                #else\r
                if(argv[1] && strncmp(argv[1],"-i",2)==0)\r
@@ -91,15 +96,18 @@ int main(int argc, char *argv[])
        signal(SIGBREAK,SigHandler);\r
 #endif\r
 \r
-       std::cout << "FMS Running in console mode." << std::endl;\r
-       std::cout << "Use the administration pages, or CTRL+C to exit" << std::endl << std::endl;\r
-       std::cout << "Available command line arguments:" << std::endl;\r
-#ifdef _WIN32\r
-       std::cout << "-i\tinstall service" << std::endl;\r
-       std::cout << "-u\tuninstall service" << std::endl;\r
-#else\r
-       std::cout << "-d\trun as daemon" << std::endl;\r
-#endif\r
+       if(daemon==false)\r
+       {\r
+               std::cout << "FMS Running in console mode." << std::endl;\r
+               std::cout << "Use the administration pages, or CTRL+C to exit" << std::endl << std::endl;\r
+               std::cout << "Available command line arguments:" << std::endl;\r
+       #ifdef _WIN32\r
+               std::cout << "-i\tinstall service" << std::endl;\r
+               std::cout << "-u\tuninstall service" << std::endl;\r
+       #else\r
+               std::cout << "-d\trun as daemon" << std::endl;\r
+       #endif\r
+       }\r
 \r
        MainFunction();\r
 \r
@@ -126,5 +134,7 @@ void MainFunction()
                PThread::Sleep(1000);\r
        }while(!wantshutdown);\r
 \r
+       LogFile::Instance()->WriteLog(LogFile::LOGLEVEL_DEBUG,"FMS wants to shutdown");\r
+\r
        Shutdown();\r
 }\r