proper way how to daemonize

3 files changed, 21 insertions, 38 deletions

diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp
index 674a6950..f13d8427 100644
--- a/src/Daemon/CrashWatcher.cpp
+++ b/src/Daemon/CrashWatcher.cpp
@@ -571,38 +571,11 @@ void CCrashWatcher::GStartWatch()
     g_main_run (m_pMainloop);
 }
 
-
-void CCrashWatcher::Daemonize()
-{
-    Lock();
-    Debug("Daemonize...");
-    // forking to background
-    pid_t pid = fork();
-	if (pid < 0)
-    {
-	    throw CABRTException(EXCEP_FATAL, "CCrashWatcher::Daemonize(): Fork error");
-    }
-    /* parent exits */
-	if (pid > 0) _exit(0);
-	/* child (daemon) continues */
-    pid_t sid = setsid();
-    if(sid == -1)
-    {
-        throw CABRTException(EXCEP_FATAL, "CCrashWatcher::Daemonize(): setsid failed");
-    }
-    close(STDIN_FILENO);
-    close(STDOUT_FILENO);
-    close(STDERR_FILENO);
-    /* we need a pid file for the child process */
-    CreatePidFile();
-    GStartWatch();
-}
-
 void CCrashWatcher::Run()
 {
+    Debug("Runnig...");
     Lock();
     CreatePidFile();
-    Debug("Runnig...");
     GStartWatch();
 }
 
diff --git a/src/Daemon/CrashWatcher.h b/src/Daemon/CrashWatcher.h
index a181f38a..e5124789 100644
--- a/src/Daemon/CrashWatcher.h
+++ b/src/Daemon/CrashWatcher.h
@@ -100,9 +100,6 @@ class CCrashWatcher
         //CCrashWatcher(const std::string& pPath,DBus::Connection &connection);
         CCrashWatcher(const std::string& pPath);
 		virtual ~CCrashWatcher();
-        //run as daemon
-        void Daemonize();
-        //don't go background - for debug
         void Run();
 
     /* methods exported on dbus */
diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp
index a404e809..94f5e666 100644
--- a/src/Daemon/Daemon.cpp
+++ b/src/Daemon/Daemon.cpp
@@ -33,7 +33,7 @@ void terminate(int signal)
 
 void print_help()
 {
-    
+
 }
 
 int main(int argc, char** argv)
@@ -44,7 +44,6 @@ int main(int argc, char** argv)
     signal(SIGINT, terminate);
     try
     {
-        g_pCrashWatcher = new CCrashWatcher(DEBUG_DUMPS_DIR);
 
         if (argc > 1)
         {
@@ -55,12 +54,26 @@ int main(int argc, char** argv)
         }
         if(daemonize)
         {
-            g_pCrashWatcher->Daemonize();
-        }
-        else
-        {
-            g_pCrashWatcher->Run();
+            // forking to background
+            pid_t pid = fork();
+            if (pid < 0)
+            {
+                throw CABRTException(EXCEP_FATAL, "CCrashWatcher::Daemonize(): Fork error");
+            }
+            /* parent exits */
+            if (pid > 0) _exit(0);
+            /* child (daemon) continues */
+            pid_t sid = setsid();
+            if(sid == -1)
+            {
+                throw CABRTException(EXCEP_FATAL, "CCrashWatcher::Daemonize(): setsid failed");
+            }
+            close(STDIN_FILENO);
+            close(STDOUT_FILENO);
+            close(STDERR_FILENO);
         }
+        g_pCrashWatcher = new CCrashWatcher(DEBUG_DUMPS_DIR);
+        g_pCrashWatcher->Run();
     }
     catch(CABRTException& e)
     {