Replace almost all calls to syslog() with logging framework. (refs #3)

2 files changed, 35 insertions, 34 deletions

diff --git a/bin/bbackupd/BackupClientContext.cpp b/bin/bbackupd/BackupClientContext.cpp
index 18859393..4b4efd90 100644
--- a/bin/bbackupd/BackupClientContext.cpp
+++ b/bin/bbackupd/BackupClientContext.cpp
@@ -9,12 +9,10 @@
 
 #include "Box.h"
 
-#ifdef HAVE_SYSLOG_H
-	#include <syslog.h>
-#endif
 #ifdef HAVE_SIGNAL_H
 	#include <signal.h>
 #endif
+
 #ifdef HAVE_SYS_TIME_H
 	#include <sys/time.h>
 #endif
@@ -127,7 +125,8 @@ BackupProtocolClient &BackupClientContext::GetConnection()
 		}
 		
 		// Log intention
-		::syslog(LOG_INFO, "Opening connection to server %s...", mHostname.c_str());
+		BOX_INFO("Opening connection to server '" <<
+			mHostname << "'...");
 
 		// Connect!
 		mpSocket->Open(mrTLSContext, Socket::TypeINET, mHostname.c_str(), BOX_PORT_BBSTORED);
@@ -147,8 +146,8 @@ BackupProtocolClient &BackupClientContext::GetConnection()
 
 			if (!mpExtendedLogFileHandle)
 			{
-				::syslog(LOG_ERR, "Failed to open extended "
-					"log file: %s", strerror(errno));
+				BOX_ERROR("Failed to open extended log "
+					"file: " << strerror(errno));
 			}
 			else
 			{
@@ -194,7 +193,7 @@ BackupProtocolClient &BackupClientContext::GetConnection()
 		}
 		
 		// Log success
-		::syslog(LOG_INFO, "Connection made, login successful");
+		BOX_INFO("Connection made, login successful");
 
 		// Check to see if there is any space available on the server
 		if(loginConf->GetBlocksUsed() >= loginConf->GetBlocksHardLimit())
@@ -202,7 +201,8 @@ BackupProtocolClient &BackupClientContext::GetConnection()
 			// no -- flag so only things like deletions happen
 			mStorageLimitExceeded = true;
 			// Log
-			::syslog(LOG_WARNING, "Exceeded storage hard-limit on server -- not uploading changes to files");
+			BOX_WARNING("Exceeded storage hard-limit on server, "
+				"not uploading changes to files");
 		}
 	}
 	catch(...)
diff --git a/bin/bbackupd/Win32ServiceFunctions.cpp b/bin/bbackupd/Win32ServiceFunctions.cpp
index 3010cf3f..f4c8894b 100644
--- a/bin/bbackupd/Win32ServiceFunctions.cpp
+++ b/bin/bbackupd/Win32ServiceFunctions.cpp
@@ -44,7 +44,7 @@ void ErrorHandler(char *s, DWORD err)
 	char buf[256];
 	memset(buf, 0, sizeof(buf));
 	_snprintf(buf, sizeof(buf)-1, "%s (%d)", s, err);
-	::syslog(LOG_ERR, "%s", buf);
+	BOX_ERROR(buf);
 	MessageBox(0, buf, "Error", 
 		MB_OK | MB_SETFOREGROUND | MB_DEFAULT_DESKTOP_ONLY);
 	ExitProcess(err);
@@ -191,16 +191,16 @@ int InstallService(const char* pConfigFileName)
 
 		if (emu_stat(pConfigFileName, &st) != 0)
 		{
-			syslog(LOG_ERR, "Failed to open configuration file: "
-				"%s: %s", pConfigFileName, strerror(errno));
+			BOX_ERROR("Failed to open configuration file '" <<
+				pConfigFileName << "': " << strerror(errno));
 			return 1;
 		}
 
 		if (!(st.st_mode & S_IFREG))
 		{
 	
-			syslog(LOG_ERR, "Failed to open configuration file: "
-				"%s: not a file", pConfigFileName);
+			BOX_ERROR("Failed to open configuration file '" <<
+				pConfigFileName << "': not a file");
 			return 1;
 		}
 	}
@@ -209,8 +209,8 @@ int InstallService(const char* pConfigFileName)
 
 	if (!scm) 
 	{
-		syslog(LOG_ERR, "Failed to open service control manager: "
-			"error %d", GetLastError());
+		BOX_ERROR("Failed to open service control manager: " <<
+			GetErrorMessage(GetLastError()));
 		return 1;
 	}
 
@@ -248,21 +248,21 @@ int InstallService(const char* pConfigFileName)
 		{
 			case ERROR_SERVICE_EXISTS:
 			{
-				::syslog(LOG_ERR, "Failed to create Box Backup "
+				BOX_ERROR("Failed to create Box Backup "
 					"service: it already exists");
 			}
 			break;
 
 			case ERROR_SERVICE_MARKED_FOR_DELETE:
 			{
-				::syslog(LOG_ERR, "Failed to create Box Backup "
+				BOX_ERROR("Failed to create Box Backup "
 					"service: it is waiting to be deleted");
 			}
 			break;
 
 			case ERROR_DUPLICATE_SERVICE_NAME:
 			{
-				::syslog(LOG_ERR, "Failed to create Box Backup "
+				BOX_ERROR("Failed to create Box Backup "
 					"service: a service with this name "
 					"already exists");
 			}
@@ -270,15 +270,16 @@ int InstallService(const char* pConfigFileName)
 
 			default:
 			{
-				::syslog(LOG_ERR, "Failed to create Box Backup "
-					"service: error %d", err);
+				BOX_ERROR("Failed to create Box Backup "
+					"service: error " <<
+					GetErrorMessage(GetLastError()));
 			}
 		}
 
 		return 1;
 	}
 
-	::syslog(LOG_INFO, "Created Box Backup service");
+	BOX_INFO("Created Box Backup service");
 	
 	SERVICE_DESCRIPTION desc;
 	desc.lpDescription = "Backs up your data files over the Internet";
@@ -286,8 +287,8 @@ int InstallService(const char* pConfigFileName)
 	if (!ChangeServiceConfig2(newService, SERVICE_CONFIG_DESCRIPTION,
 		&desc))
 	{
-		::syslog(LOG_WARNING, "Failed to set description for "
-			"Box Backup service: error %d", GetLastError());
+		BOX_WARNING("Failed to set description for Box Backup "
+			"service: " << GetErrorMessage(GetLastError()));
 	}
 
 	CloseServiceHandle(newService);
@@ -301,8 +302,8 @@ int RemoveService(void)
 
 	if (!scm) 
 	{
-		syslog(LOG_ERR, "Failed to open service control manager: "
-			"error %d", GetLastError());
+		BOX_ERROR("Failed to open service control manager: " <<
+			GetErrorMessage(GetLastError()));
 		return 1;
 	}
 
@@ -317,13 +318,13 @@ int RemoveService(void)
 			err == ERROR_IO_PENDING) 
 			// hello microsoft? anyone home?
 		{
-			syslog(LOG_ERR, "Failed to open Box Backup service: "
+			BOX_ERROR("Failed to open Box Backup service: "
 				"not installed or not found");
 		}
 		else
 		{
-			syslog(LOG_ERR, "Failed to open Box Backup service: "
-				"error %d", err);
+			BOX_ERROR("Failed to open Box Backup service: " <<
+				GetErrorMessage(err));
 		}
 		return 1;
 	}
@@ -334,8 +335,8 @@ int RemoveService(void)
 		err = GetLastError();
 		if (err != ERROR_SERVICE_NOT_ACTIVE)
 		{
-			syslog(LOG_WARNING, "Failed to stop Box Backup "
-				"service: error %d", err);
+			BOX_WARNING("Failed to stop Box Backup service: " <<
+				GetErrorMessage(err));
 		}
 	}
 
@@ -345,18 +346,18 @@ int RemoveService(void)
 
 	if (deleted)
 	{
-		syslog(LOG_INFO, "Box Backup service deleted");
+		BOX_INFO("Box Backup service deleted");
 		return 0;
 	}
 	else if (err == ERROR_SERVICE_MARKED_FOR_DELETE)
 	{
-		syslog(LOG_ERR, "Failed to remove Box Backup service: "
+		BOX_ERROR("Failed to remove Box Backup service: "
 			"it is already being deleted");
 	}
 	else
 	{
-		syslog(LOG_ERR, "Failed to remove Box Backup service: "
-			"error %d", err);
+		BOX_ERROR("Failed to remove Box Backup service: " <<
+			GetErrorMessage(err));
 	}
 
 	return 1;