[Initng-svn] r2997 - initng/plugins/daemon

[svn at initng.thinktux.net]

Author: jimmy
Date: Thu Feb 16 01:10:17 2006
New Revision: 2997

Modified:
   initng/plugins/daemon/initng_daemon.c
Log:
Test this makomk.


Modified: initng/plugins/daemon/initng_daemon.c
==============================================================================
--- initng/plugins/daemon/initng_daemon.c	(original)
+++ initng/plugins/daemon/initng_daemon.c	Thu Feb 16 01:10:17 2006
@@ -542,13 +542,13 @@
 static void handle_DAEMON_STOP_DEPS_MET(active_db_h * service)
 {
     process_h *process = NULL;
-    int timeout = DEFAULT_KILL_TIMEOUT;
+    int timeout;
 
     /* get the KILL_TIMEOUT */
-    if (initng_active_db_is(&KILL_TIMEOUT, service))
-    {
-        timeout=initng_active_db_get_int(&KILL_TIMEOUT, service);
-    }
+    timeout=initng_active_db_get_int(&KILL_TIMEOUT, service);
+
+    if(timeout==0)
+	timeout = DEFAULT_KILL_TIMEOUT
 
     /* find the daemon, and check so it still exits */
     if(!(process=initng_process_db_get(&T_DAEMON, service)))
@@ -585,18 +585,9 @@
             /* if there is no plugin that wanna kill this daemon,
              * we do it ourself.
              */
-	    if(timeout == 0)
-	    {
-        	kill_daemon(service, SIGTERM);
-	    	if(!initng_common_mark_service(service, &DAEMON_TERM))
-		    return;
-	    }
-	    else
-	    {
-        	kill_daemon(service, SIGKILL);
-	    	if(!initng_common_mark_service(service, &DAEMON_KILL))
-		    return;
-	    }	
+    	    kill_daemon(service, SIGKILL);
+	    if(!initng_common_mark_service(service, &DAEMON_KILL))
+		return;
             break;
 	}
         default: