Changeset 2588

Timestamp:

26/11/2009 21:44:22 (2 years ago)

Author:

chris

Message:

Add location of config file as an additional parameter to the
SyncAllowScript? and the NotifyScript, thanks to Achim J. Latz.

File:

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

box/trunk/bin/bbackupd/BackupDaemon.cpp

@@ -1022 +1022 @@
         try
         {
+                std::string script("\"" + conf.GetKeyValue("SyncAllowScript") + 
+                        "\" \"" + GetConfigFileName() + "\"");
+
                 std::auto_ptr<IOStream> pscript(LocalProcessStream(
-                        conf.GetKeyValue("SyncAllowScript").c_str(), pid));
+                        script.c_str(), pid));
 
                 // Read in the result
@@ -1045 +1048 @@
                                 catch(ConversionException &e)
                                 {
-                                        BOX_ERROR("Invalid output "
-                                                "from SyncAllowScript '"
-                                                << conf.GetKeyValue("SyncAllowScript")
-                                                << "': '" << line << "'");
+                                        BOX_ERROR("Invalid output from "
+                                                "SyncAllowScript " <<
+                                                script << ": '" << line << "'");
                                         throw;
                                 }
 
                                 BOX_NOTICE("Delaying sync by " << waitInSeconds
-                                        << " seconds (SyncAllowScript '"
+                                        << " seconds (SyncAllowScript "
                                         << conf.GetKeyValue("SyncAllowScript")
-                                        << "')");
+                                        << ")");
                         }
                 }
@@ -2194 +2196 @@
 
         // Script to run
-        std::string script(conf.GetKeyValue("NotifyScript") + ' ' +
-                sEventNames[Event]);
+        std::string script("\"" + conf.GetKeyValue("NotifyScript") + "\" " +
+                sEventNames[Event] + " \"" + GetConfigFileName() + "\"");
         
         // Log what we're about to do
         BOX_INFO("About to notify administrator about event "
-                << sEventNames[Event] << ", running script '"
-                << script << "'");
+                << sEventNames[Event] << ", running script " << script);
         
         // Then do it
@@ -2207 +2208 @@
         {
                 BOX_WARNING("Notify script returned error code: " <<
-                        returnCode << " ('" << script << "')");
+                        returnCode << " (" << script << ")");
         }
         else if(Event != SysadminNotifier::BackupStart &&