[30335] trunk/base/src/programs/daemondo/main.c

[source_changes at macosforge.org]

Revision: 30335
          http://trac.macosforge.org/projects/macports/changeset/30335
Author:   jberry at macports.org
Date:     2007-10-24 21:33:13 -0700 (Wed, 24 Oct 2007)

Log Message:
-----------
Improve daemondo logging at level 1 such that recognition of child death is evident.
Add some additional logging at level 1.

Modified Paths:
--------------
    trunk/base/src/programs/daemondo/main.c

Modified: trunk/base/src/programs/daemondo/main.c
===================================================================
--- trunk/base/src/programs/daemondo/main.c	2007-10-25 03:50:26 UTC (rev 30334)
+++ trunk/base/src/programs/daemondo/main.c	2007-10-25 04:33:13 UTC (rev 30335)
@@ -378,8 +378,8 @@
     // Take special note if process runningPid dies
     if (runningPid != 0 && runningPid != -1 && childPid == runningPid)
     {
-        if (verbosity >= 3)
-            LogMessage("Target process id %d has died.\n", childPid);
+        if (verbosity >= 1)
+            LogMessage("Target process pid %d has died.\n", childPid);
             
         UnmonitorChild();
         DestroyPidFile();
@@ -498,7 +498,7 @@
     }
     
     if (verbosity >= 1)
-        LogMessage("starting process\n");
+        LogMessage("Starting process\n");
     if (verbosity >= 2)
         LogMessage("Running start-cmd %s.\n", CatArray(startArgs, buf, sizeof(buf)));
         
@@ -570,7 +570,7 @@
         if ((pid = runningPid) != 0 && pid != -1)
         {
             if (verbosity >= 1)
-                LogMessage("stopping process %d\n", pid);
+                LogMessage("Stopping process %d\n", pid);
             
             // Send the process a SIGTERM to ask it to quit
             kill(pid, SIGTERM);
@@ -589,7 +589,7 @@
         // We have a stop-cmd to use. We execute it synchronously,
         // and trust it to do the job.
         if (verbosity >= 1)
-            LogMessage("stopping process\n");
+            LogMessage("Stopping process\n");
         if (verbosity >= 2)
             LogMessage("Running stop-cmd %s.\n", CatArray(stopArgs, buf, sizeof(buf)));
         pid = Exec(stopArgs, TRUE);
@@ -620,7 +620,7 @@
     {
         // We weren't given a restart command, so just use stop/start
         if (verbosity >= 1)
-            LogMessage("restarting process\n");
+            LogMessage("Restarting process\n");
         Stop();
         Start();
     }
@@ -628,7 +628,7 @@
     {
         // Execute the restart-cmd and trust it to do the job
         if (verbosity >= 1)
-            LogMessage("restarting process\n");
+            LogMessage("Restarting process\n");
         if (verbosity >= 2)
             LogMessage("Running restart-cmd %s.\n", CatArray(restartArgs, buf, sizeof(buf)));
         pid_t pid = Exec(restartArgs, TRUE);
@@ -782,11 +782,15 @@
         if (!terminating)
         {
             terminating = true;
+            if (verbosity >= 1)
+                LogMessage("SIGTERM received\n");
             Stop();
         }
         break;
     
     case SIGHUP:
+        if (verbosity >= 1)
+            LogMessage("SIGHUP received\n");
         if (!terminating)
             Restart();
         break;

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071024/5e678f13/attachment.html