[Initng-svn] r2367 - initng/src

[svn at initng.thinktux.net]

Author: jimmy
Date: Thu Dec  8 12:41:21 2005
New Revision: 2367

Modified:
   initng/src/initng_handler.c
Log:
More information in some errormessages.


Modified: initng/src/initng_handler.c
==============================================================================
--- initng/src/initng_handler.c	(original)
+++ initng/src/initng_handler.c	Thu Dec  8 12:41:21 2005
@@ -105,7 +105,7 @@
         /* make sure this service has timed out */
         if ((time(0) - to_term->time_got_status) < timeout)
         {
-            D_("Have to wait a bit more before killing this service!\n");
+            D_("Have to wait a bit more before killing %s!\n", to_term->name);
             reactivate_alarm = TRUE;
             continue;
         }
@@ -118,7 +118,7 @@
         {
             if (process->pid < 0)
             {
-                F_("There exists a process without a pid in the db!\n");
+                F_("There exists a process service:%s without a pid in the db!\n", to_term->name);
                 continue;
             }
 
@@ -127,8 +127,8 @@
             if (kill(process->pid, 0) < 0 && (errno == ESRCH))
             {
                 /* This process is already dead */
-                F_("process %s pid %i is already dead, cleaning up.\n",
-                   to_term->name, process->pid);
+                F_("process %s pid %i service %s is already dead, cleaning up.\n",
+                   to_term->name, process->pid, to_term->name);
 
                 list_del(&process->list);
                 process_db_free(process);
@@ -163,20 +163,20 @@
 
     if (!service_to_start->a_state)
     {
-        F_("Status for service not set.\n");
+        F_("Status for service %s not set.\n", service_to_start->name);
         return (FALSE);
     }
 
     if (!service_to_start->type)
     {
-        F_("Type for service not set.\n");
+        F_("Type for service %s not set.\n", service_to_start->name);
         return (FALSE);
     }
 
     /* check system state, if we can launch. */
     if (g.sys_state != STATE_STARTING && g.sys_state != STATE_UP)
     {
-        F_("Cant start service, when system status is: %i !\n", g.sys_state);
+        F_("Cant start service %s, when system status is: %i !\n", service_to_start->name, g.sys_state);
         return (FALSE);
     }
 
@@ -235,13 +235,13 @@
 
     if (!service_to_stop->a_state)
     {
-        F_("A status is not set, so i cant stop_service\n");
+        F_("A status is not set, so i cant stop_service %s\n", service_to_stop->name);
         return (FALSE);
     }
 
     if (!service_to_stop->type)
     {
-        F_("Service type is missing!\n");
+        F_("Service %s type is missing!\n", service_to_stop->name);
         return (FALSE);
     }
 
@@ -254,7 +254,7 @@
 
     if (IS_STARTING(service_to_stop))
     {
-        F_("Service is starting, cant stop it!\n");
+        F_("Service %s is starting, cant stop it!\n", service_to_stop->name);
         /*mark_service(service_to_stop, &STOPPED); */
         return (FALSE);
     }