Suppress exception messages in LineBuffer::GetLine

These exceptions are used to communicate state to the caller, and should not be treated as errors in common cases. (cherry picked from commit 86f3e9c)
boxbackup · Jan 15, 2018 · ef12d71 · ef12d71
1 parent 46e96d2
commit ef12d71
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/lib/bbackupd/BackupDaemon.cpp b/lib/bbackupd/BackupDaemon.cpp
@@ -2162,8 +2162,12 @@ void BackupDaemon::WaitOnCommandSocket(box_time_t RequiredDelay, bool &DoSyncFla
 		std::string command;
 		while(mapCommandSocketInfo->mapGetLine.get() != 0)
 		{
-			command = mapCommandSocketInfo->mapGetLine->GetLine(
-				false /* no preprocessing */, timeout);
+			{
+				HideExceptionMessageGuard hide_exceptions;
+				command = mapCommandSocketInfo->mapGetLine->GetLine(
+					false /* no preprocessing */, timeout);
+			}
+
 			BOX_TRACE("Received command '" << command << "' over command socket");
 
 			bool sendOK = false;

diff --git a/lib/bbstored/BBStoreDHousekeeping.cpp b/lib/bbstored/BBStoreDHousekeeping.cpp
@@ -219,6 +219,7 @@ bool BackupStoreDaemon::CheckForInterProcessMsg(int AccountNum, int MaximumWaitT
 
 	try
 	{
+		HideExceptionMessageGuard hide_exceptions;
 		line = mInterProcessComms.GetLine(false /* no pre-processing */,
 			MaximumWaitTime);
 	}
-Original file line number
+Diff line change
@@ Expand Up @@
     	try
     	{
+    		HideExceptionMessageGuard hide_exceptions;
     		line = mInterProcessComms.GetLine(false /* no pre-processing */,
     			MaximumWaitTime);
     	}
@@ Expand Down @@