[Box Backup-commit] COMMIT r1876 - box/trunk/bin/bbackupctl
boxbackup-dev at fluffy.co.uk
boxbackup-dev at fluffy.co.uk
Wed Oct 17 13:47:37 BST 2007
Author: chris
Date: 2007-10-17 13:47:37 +0100 (Wed, 17 Oct 2007)
New Revision: 1876
Modified:
box/trunk/bin/bbackupctl/bbackupctl.cpp
Log:
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])
Modified: box/trunk/bin/bbackupctl/bbackupctl.cpp
===================================================================
--- box/trunk/bin/bbackupctl/bbackupctl.cpp 2007-10-17 12:47:00 UTC (rev 1875)
+++ box/trunk/bin/bbackupctl/bbackupctl.cpp 2007-10-17 12:47:37 UTC (rev 1876)
@@ -145,7 +145,8 @@
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 @@
" UpdateStoreInterval = " << updateStoreInterval <<
" seconds\n"
" MinimumFileAge = " << minimumFileAge << " seconds\n"
- " MaxUploadWait = " << maxUploadWait << " seconds\n");
+ " MaxUploadWait = " << maxUploadWait << " seconds");
}
std::string stateLine;
@@ -312,7 +313,7 @@
{
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 @@
{
if(!quiet)
{
- BOX_INFO("Succeeded.\n");
+ BOX_INFO("Succeeded.");
}
finished = true;
}
More information about the Boxbackup-commit
mailing list