[Initng-svn] r2972 - initng/plugins/syslog

[svn at initng.thinktux.net]

Author: jimmy
Date: Thu Feb  9 15:30:46 2006
New Revision: 2972

Modified:
   initng/plugins/syslog/initng_syslog.c
Log:
Let initng_syslog only poll rough states.


Modified: initng/plugins/syslog/initng_syslog.c
==============================================================================
--- initng/plugins/syslog/initng_syslog.c	(original)
+++ initng/plugins/syslog/initng_syslog.c	Thu Feb  9 15:30:46 2006
@@ -155,27 +155,34 @@
     if (IS_UP(service))
     {
         check_syslog();
-        initng_log(LOG_NOTICE, NULL, "Service %s is started.\n",
+        initng_log(LOG_NOTICE, NULL, "Service %s is up.\n",
                    service->name);
         return (TRUE);
     }
 
-    if (IS_MARK(service, &STOPPED))
+    if (IS_DOWN(service))
     {
         initng_log(LOG_NOTICE, NULL, "Service %s has been stopped.\n",
                    service->name);
         return (TRUE);
     }
-    if (IS_MARK(service, &FAIL_STARTING))
+    if (IS_FAILED(service))
     {
-        initng_log(LOG_NOTICE, NULL, "Service %s FAILED to start.\n",
+        initng_log(LOG_NOTICE, NULL, "Service %s FAILED.\n",
                    service->name);
         return (TRUE);
     }
 
-    if (IS_MARK(service, &FAIL_STOPPING))
+    if (IS_STOPPING(service))
     {
-        initng_log(LOG_NOTICE, NULL, "Service %s FAILED to stop.\n",
+        initng_log(LOG_NOTICE, NULL, "Service %s is stopping.\n",
+                   service->name);
+        return (TRUE);
+    }
+
+    if (IS_STARTING(service))
+    {
+        initng_log(LOG_NOTICE, NULL, "Service %s is starting.\n",
                    service->name);
         return (TRUE);
     }
@@ -322,10 +329,10 @@
     setlogmask(LOG_UPTO(LOG_NOTICE));
     openlog("InitNG", 0, LOG_LOCAL1);
 
-    initng_plugin_hook_add(&g.ERR_MSG, 50, &syslog_print_error);
-    initng_plugin_hook_add(&g.ASTATUS_CHANGE, 100, &syslog_print_status_change);
+    initng_plugin_hook_add(&g.IS_CHANGE, 100, &syslog_print_status_change);
     initng_plugin_hook_add(&g.SWATCHERS, 100, &syslog_print_system_state);
     initng_plugin_hook_add(&g.PIPEWATCHERS, 100, &syslog_fetch_output);
+    initng_plugin_hook_add(&g.ERR_MSG, 50, &syslog_print_error);
 
     return (TRUE);
 }
@@ -340,7 +347,7 @@
         return;
     }
 
-    initng_plugin_hook_del(&g.ASTATUS_CHANGE, &syslog_print_status_change);
+    initng_plugin_hook_del(&g.IS_CHANGE, &syslog_print_status_change);
     initng_plugin_hook_del(&g.SWATCHERS, &syslog_print_system_state);
     initng_plugin_hook_del(&g.PIPEWATCHERS, &syslog_fetch_output);
     initng_plugin_hook_del(&g.ERR_MSG, &syslog_print_error);