Changeset 1784 for box/chris/general/bin/bbackupd/Win32ServiceFunctions.cpp

Timestamp:

01/08/2007 00:18:50 (5 years ago)

Author:

chris

Message:

Replace almost all calls to syslog() with logging framework. (merges [1783])

File:

• box/chris/general/bin/bbackupd/Win32ServiceFunctions.cpp (modified) (14 diffs)

box/chris/general/bin/bbackupd/Win32ServiceFunctions.cpp

@@ -45 +45 @@
         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);
@@ -192 +192 @@
                 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;
                 }
@@ -200 +200 @@
                 {
         
-                        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;
                 }
@@ -210 +210 @@
         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;
         }
@@ -249 +249 @@
                         case ERROR_SERVICE_EXISTS:
                         {
-                                ::syslog(LOG_ERR, "Failed to create Box Backup "
+                                BOX_ERROR("Failed to create Box Backup "
                                         "service: it already exists");
                         }
@@ -256 +256 @@
                         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");
                         }
@@ -263 +263 @@
                         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");
@@ -271 +271 @@
                         default:
                         {
-                                ::syslog(LOG_ERR, "Failed to create Box Backup "
-                                        "service: error %d", err);
+                                BOX_ERROR("Failed to create Box Backup "
+                                        "service: error " <<
+                                        GetErrorMessage(GetLastError()));
                         }
                 }
@@ -279 +280 @@
         }
 
-        ::syslog(LOG_INFO, "Created Box Backup service");
+        BOX_INFO("Created Box Backup service");
         
         SERVICE_DESCRIPTION desc;
@@ -287 +288 @@
                 &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()));
         }
 
@@ -302 +303 @@
         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;
         }
@@ -318 +319 @@
                         // 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;
@@ -335 +336 @@
                 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));
                 }
         }
@@ -346 +347 @@
         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));
         }