[monit-dev] [monit] r373 committed - The stacktrace on every error in -v mode was too verbose for common se...

[monit]

Revision: 373
Author:   address@hidden
Date:     Mon May 30 06:02:52 2011
Log:      The stacktrace on every error in -v mode was too verbose for  
common service debugging tasks and confusing for users, the stacktrace  
logging was relaxed, to enable it use the -vv option.


http://code.google.com/p/monit/source/detail?r=373

Modified:
 /trunk/CHANGES.txt
 /trunk/log.c
 /trunk/monit.pod
 /trunk/monitor.c

=======================================
--- /trunk/CHANGES.txt  Mon May 23 04:35:35 2011
+++ /trunk/CHANGES.txt  Mon May 30 06:02:52 2011
@@ -17,6 +17,10 @@
 * Fix crash on Solaris which may occur if the system load is zero.
   Thanks to Paul Sun for report.

+* The stacktrace logging on error is disabled in -v (verbose) mode
+  as it was too verbose for common service debugging tasks, it can
+  be enabled using -vv option.
+


 Version 5.2.5
=======================================
--- /trunk/log.c        Wed Jan 19 10:40:32 2011
+++ /trunk/log.c        Mon May 30 06:02:52 2011
@@ -433,7 +433,7 @@
   void *callstack[128];
   char **strs;

-  if (Run.debug) {
+  if (Run.debug >= 2) {
     frames = backtrace(callstack, 128);
     strs = backtrace_symbols(callstack, frames);
      
LogDebug("-------------------------------------------------------------------------------\n");
=======================================
--- /trunk/monit.pod    Wed Apr  6 06:52:02 2011
+++ /trunk/monit.pod    Mon May 30 06:02:52 2011
@@ -75,6 +75,9 @@
 B<-v>
    Verbose mode, work noisy (diagnostic output)

+B<-vv>
+   Very verbose mode, same as -v plus log stacktrace on error
+
 B<-H> I<[filename]>
    Print MD5 and SHA1 hashes of the file or of stdin if the
    filename is omitted; Monit will exit afterwards
=======================================
--- /trunk/monitor.c    Sun Mar 27 01:59:46 2011
+++ /trunk/monitor.c    Mon May 30 06:02:52 2011
@@ -641,7 +641,7 @@
         break;

     case 'v':
-        Run.debug = TRUE;
+        Run.debug++;
         break;

     case 'H':
@@ -703,6 +703,7 @@
   printf(" -I            Do not run in background (needed for run from  
init)\n");
   printf(" -t            Run syntax check for the control file\n");
   printf(" -v            Verbose mode, work noisy (diagnostic output)\n");
+  printf(" -vv           Very verbose mode, same as -v plus log stacktrace  
on error\n");
   printf(" -H [filename] Print SHA1 and MD5 hashes of the file or of stdin  
if the\n");
   printf("               filename is omited; monit will exit  
afterwards\n");
   printf(" -V            Print version number and patchlevel\n");