Changeset 2396

Timestamp:

01/12/2008 22:17:52 (3 years ago)

Author:

chris

Message:

Reduce severity of some log messages about notifying system
administrator. It's not an error to have no NotifyScript.

File:

• box/trunk/bin/bbackupd/BackupDaemon.cpp (modified) (4 diffs)

box/trunk/bin/bbackupd/BackupDaemon.cpp

@@ -2159 +2159 @@
         {
                 // Don't send lots of repeated messages
+                // Note: backup-start and backup-finish will always be
+                // logged, because mLastNotifiedEvent is never set to
+                // these values and therefore they are never "duplicates".
                 if(mLastNotifiedEvent == Event)
                 {
-                        BOX_WARNING("Suppressing duplicate notification about " <<
-                                sEventNames[Event]);
+                        if(Event == SysadminNotifier::BackupOK)
+                        {
+                                BOX_INFO("Suppressing duplicate notification "
+                                        "about " << sEventNames[Event]);
+                        }
+                        else
+                        {
+                                BOX_WARNING("Suppressing duplicate notification "
+                                        "about " << sEventNames[Event]);
+                        }
                         return;
                 }
@@ -2175 +2186 @@
                         Event != SysadminNotifier::BackupFinish)
                 {
-                        BOX_ERROR("Not notifying administrator about event "
+                        BOX_INFO("Not notifying administrator about event "
                                 << sEventNames[Event] << " -- set NotifyScript "
                                 "to do this in future");
@@ -2187 +2198 @@
         
         // Log what we're about to do
-        BOX_NOTICE("About to notify administrator about event "
+        BOX_INFO("About to notify administrator about event "
                 << sEventNames[Event] << ", running script '"
                 << script << "'");
@@ -2195 +2206 @@
         if(returnCode != 0)
         {
-                BOX_ERROR("Notify script returned error code: " <<
+                BOX_WARNING("Notify script returned error code: " <<
                         returnCode << " ('" << script << "')");
         }