Changeset 2597

Timestamp:

24/01/2010 13:46:23 (2 years ago)

Author:

chris

Message:

Revert the quotes part of [2588] as it breaks the unit tests.

Make LocalProcessStream? constructor take a std::string& for C++ style.

Location:

box/trunk

Files:

• bin/bbackupd/BackupDaemon.cpp (modified) (6 diffs)
• lib/server/LocalProcessStream.cpp (modified) (4 diffs)
• lib/server/LocalProcessStream.h (modified) (1 diff)

box/trunk/bin/bbackupd/BackupDaemon.cpp

@@ -1018 +1018 @@
         int waitInSeconds = (60*5);
 
+        std::string script(conf.GetKeyValue("SyncAllowScript") + 
+                " \"" + GetConfigFileName() + "\"");
+
         // Run it?
         pid_t pid = 0;
         try
         {
-                std::string script("\"" + conf.GetKeyValue("SyncAllowScript") + 
-                        "\" \"" + GetConfigFileName() + "\"");
-
-                std::auto_ptr<IOStream> pscript(LocalProcessStream(
-                        script.c_str(), pid));
+                std::auto_ptr<IOStream> pscript(LocalProcessStream(script,
+                        pid));
 
                 // Read in the result
@@ -1049 +1049 @@
                                 {
                                         BOX_ERROR("Invalid output from "
-                                                "SyncAllowScript " <<
-                                                script << ": '" << line << "'");
+                                                "SyncAllowScript: '" <<
+                                                line << "' (" << script << ")");
                                         throw;
                                 }
 
                                 BOX_NOTICE("Delaying sync by " << waitInSeconds
-                                        << " seconds (SyncAllowScript "
-                                        << conf.GetKeyValue("SyncAllowScript")
-                                        << ")");
+                                        << " seconds due to SyncAllowScript "
+                                        << "(" << script << ")");
                         }
                 }
@@ -1065 +1064 @@
         {
                 BOX_ERROR("Internal error running SyncAllowScript: "
-                        << e.what());
+                        << e.what() << " (" << script << ")");
         }
         catch(...)
@@ -1071 +1070 @@
                 // Ignore any exceptions
                 // Log that something bad happened
-                BOX_ERROR("Error running SyncAllowScript '"
-                        << conf.GetKeyValue("SyncAllowScript") << "'");
+                BOX_ERROR("Unknown error running SyncAllowScript (" <<
+                        script << ")");
         }
 
@@ -2189 +2188 @@
                 {
                         BOX_INFO("Not notifying administrator about event "
-                                << sEventNames[Event] << " -- set NotifyScript "
+                                << sEventNames[Event] << ", set NotifyScript "
                                 "to do this in future");
                 }
@@ -2196 +2195 @@
 
         // Script to run
-        std::string script("\"" + conf.GetKeyValue("NotifyScript") + "\" " +
+        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

box/trunk/lib/server/LocalProcessStream.cpp

@@ -44 +44 @@
 //
 // --------------------------------------------------------------------------
-std::auto_ptr<IOStream> LocalProcessStream(const char *CommandLine, pid_t &rPidOut)
+std::auto_ptr<IOStream> LocalProcessStream(const std::string& rCommandLine,
+        pid_t &rPidOut)
 {
 #ifndef WIN32
@@ -50 +51 @@
         // Split up command
         std::vector<std::string> command;
-        SplitString(std::string(CommandLine), ' ', command);
+        SplitString(rCommandLine, ' ', command);
 
         // Build arguments
@@ -138 +139 @@
         startupInfo.dwFlags   |= STARTF_USESTDHANDLES;
 
-        CHAR* commandLineCopy = (CHAR*)malloc(strlen(CommandLine) + 1);
-        strcpy(commandLineCopy, CommandLine);
+        CHAR* commandLineCopy = (CHAR*)malloc(rCommandLine.size() + 1);
+        strcpy(commandLineCopy, rCommandLine.c_str());
 
         BOOL result = CreateProcess(NULL, 
@@ -156 +157 @@
         if(!result)
         {
-                BOX_ERROR("Failed to CreateProcess: '" << CommandLine <<
+                BOX_ERROR("Failed to CreateProcess: '" << rCommandLine <<
                         "': " << GetErrorMessage(GetLastError()));
                 CloseHandle(writeInChild);

box/trunk/lib/server/LocalProcessStream.h

@@ -14 +14 @@
 #include "IOStream.h"
 
-std::auto_ptr<IOStream> LocalProcessStream(const char *CommandLine, pid_t &rPidOut);
+std::auto_ptr<IOStream> LocalProcessStream(const std::string& rCommandLine,
+        pid_t &rPidOut);
 
 #endif // LOCALPROCESSSTREAM__H