diff options
author | Chris Wilson <chris+github@qwirx.com> | 2007-10-17 12:47:37 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2007-10-17 12:47:37 +0000 |
commit | 34ecfa2e8afdfbdd171c0d838a878994721c940f (patch) | |
tree | 1167880d44926bc6c153d84653925a1cec0f913e /bin/bbackupctl/bbackupctl.cpp | |
parent | 08e5570d3781e0660d099d6ee5952a4240c9355f (diff) |
Pass the command socket name from the configuration to
WinNamedPipeStream, to allow multiple command sockets per system.
Remove unnecessary newlines from log messages.
(merges [1832])
Diffstat (limited to 'bin/bbackupctl/bbackupctl.cpp')
-rw-r--r-- | bin/bbackupctl/bbackupctl.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bin/bbackupctl/bbackupctl.cpp b/bin/bbackupctl/bbackupctl.cpp index edbc252f..3795cbed 100644 --- a/bin/bbackupctl/bbackupctl.cpp +++ b/bin/bbackupctl/bbackupctl.cpp @@ -145,7 +145,8 @@ int main(int argc, const char *argv[]) try { #ifdef WIN32 - connection.Connect(BOX_NAMED_PIPE_NAME); + std::string socket = conf.GetKeyValue("CommandSocket"); + connection.Connect(socket); #else connection.Open(Socket::TypeUNIX, conf.GetKeyValue("CommandSocket").c_str()); #endif @@ -200,7 +201,7 @@ int main(int argc, const char *argv[]) " UpdateStoreInterval = " << updateStoreInterval << " seconds\n" " MinimumFileAge = " << minimumFileAge << " seconds\n" - " MaxUploadWait = " << maxUploadWait << " seconds\n"); + " MaxUploadWait = " << maxUploadWait << " seconds"); } std::string stateLine; @@ -312,7 +313,7 @@ int main(int argc, const char *argv[]) { if (syncIsRunning) { - if (!quiet) BOX_INFO("Sync finished.\n"); + if (!quiet) BOX_INFO("Sync finished."); // Send a quit command to finish nicely connection.Write("quit\n", 5); @@ -335,7 +336,7 @@ int main(int argc, const char *argv[]) { if(!quiet) { - BOX_INFO("Succeeded.\n"); + BOX_INFO("Succeeded."); } finished = true; } |