[Initng-svn] r2954 - initng/plugins/initctl

[svn at initng.thinktux.net]

Author: jimmy
Date: Tue Feb  7 10:15:47 2006
New Revision: 2954

Modified:
   initng/plugins/initctl/initng_initctl.c
   initng/plugins/initctl/initng_initctl.h
Log:
Reopen /dev/initctl on sig HUP only


Modified: initng/plugins/initctl/initng_initctl.c
==============================================================================
--- initng/plugins/initctl/initng_initctl.c	(original)
+++ initng/plugins/initctl/initng_initctl.c	Tue Feb  7 10:15:47 2006
@@ -279,21 +279,15 @@
 
 
 /* try open fifo, every started service */
-int service_status(active_db_h * service)
+static void hup_request(void)
 {
-    /* if its not set started, dont care */
-    if (!IS_UP(service))
-        return (TRUE);
-
     if (!initctl_control_open())
     {
         F_("Warning, failed to open /dev/initctl\n");
-        return (TRUE);
     }
-    return (TRUE);
 }
 
-void is_system_up(h_sys_state state)
+static void is_system_up(h_sys_state state)
 {
     if (state == STATE_UP && (!utmp_stored))
     {
@@ -321,7 +315,7 @@
 
     initctl_control_open();
 
-    if ((!initng_plugin_hook_add(&g.ASTATUS_CHANGE, 50, &service_status))
+    if ((!initng_plugin_hook_add(&g.HUP, 50, &hup_request))
         || (!initng_plugin_hook_add(&g.SWATCHERS, 50, &is_system_up)))
     {
         F_("Fail add hook!\n");
@@ -344,5 +338,5 @@
     /* remove all hooks */
     initng_plugin_hook_del(&g.FDWATCHERS, &pipe_fd);
     initng_plugin_hook_del(&g.SWATCHERS, &is_system_up);
-    initng_plugin_hook_del(&g.ASTATUS_CHANGE, &service_status);
+    initng_plugin_hook_del(&g.HUP, &hup_request);
 }

Modified: initng/plugins/initctl/initng_initctl.h
==============================================================================
--- initng/plugins/initctl/initng_initctl.h	(original)
+++ initng/plugins/initctl/initng_initctl.h	Tue Feb  7 10:15:47 2006
@@ -20,5 +20,3 @@
 
 int module_init(const char *version);
 void module_unload(void);
-int service_status(active_db_h * service);
-void is_system_up(h_sys_state state);