[Initng-svn] r2960 - initng/plugins/cpout

[svn at initng.thinktux.net]

Author: jimmy
Date: Tue Feb  7 11:21:44 2006
New Revision: 2960

Modified:
   initng/plugins/cpout/initng_colorprint_out.c
Log:
Cpout now uses global states.


Modified: initng/plugins/cpout/initng_colorprint_out.c
==============================================================================
--- initng/plugins/cpout/initng_colorprint_out.c	(original)
+++ initng/plugins/cpout/initng_colorprint_out.c	Tue Feb  7 11:21:44 2006
@@ -114,26 +114,19 @@
                initng_active_db_percent_stopped(), s->name, is);
 }
 
-/*
-   static void out_service(const char *status, char *name)
-   {
-   assert(status);
-   assert(name);
-   clear_lastserv();
-   printf(P "    [" C_GREEN "%s" C_OFF "]\n", status, name);
-   } */
 
 int print_output(active_db_h * service)
 {
     assert(service);
     assert(service->name);
 
-    if (IS_MARK(service, &STOPPED))
+    if (IS_DOWN(service))
     {
         opt_service_stop_p(service, "stopped");
         return (TRUE);
     }
-    if (IS_MARK(service, &STARTING))
+    
+    if (IS_STARTING(service))
     {
 
         /* if we print this on boot, we clutter up the screen to mutch */
@@ -145,18 +138,15 @@
         return (TRUE);
     }
 
-    if (IS_MARK(service, &DONE))
+    if (IS_UP(service))
     {
-        out_service_done(service);
-        return (TRUE);
-    }
-
-    if (IS_MARK(service, &RUNNING))
-    {
-        process_h *process = initng_process_db_get(&T_DAEMON, service);
+        process_h *process = initng_process_db_get_by_name("daemon", service);
 
         if (!process)
-            return (FALSE);
+	{
+    	    out_service_done(service);
+            return (TRUE);
+	}
         clear_lastserv();
         printf(PE "\t[" C_GREEN "started" C_OFF "]\t(pid : %i).\n",
                initng_active_db_percent_started(), service->name,
@@ -164,10 +154,8 @@
         return (TRUE);
     }
 
-
-    if (IS_MARK(service, &STOP_MARKED))
+    if (IS_STOPPING(service))
     {
-
         /*
          * dont prompt that we are stopping a service, if system is shuting down, i 
          * do think that the user is aware about this.
@@ -401,7 +389,7 @@
     D_("module_init();\n");
     lastservice = NULL;
     initng_plugin_hook_add(&g.ERR_MSG, 10, &cp_print_error);
-    initng_plugin_hook_add(&g.ASTATUS_CHANGE, 80, &print_output);
+    initng_plugin_hook_add(&g.IS_CHANGE, 80, &print_output);
     initng_plugin_hook_add(&g.SWATCHERS, 80, &print_system_state);
     initng_plugin_hook_add(&g.PIPEWATCHERS, 50, &print_program_output);
     return (TRUE);
@@ -410,7 +398,7 @@
 void module_unload(void)
 {
     D_("color_out: module_unload();\n");
-    initng_plugin_hook_del(&g.ASTATUS_CHANGE, &print_output);
+    initng_plugin_hook_del(&g.IS_CHANGE, &print_output);
     initng_plugin_hook_del(&g.SWATCHERS, &print_system_state);
     initng_plugin_hook_del(&g.PIPEWATCHERS, &print_program_output);
     initng_plugin_hook_del(&g.ERR_MSG, &cp_print_error);