Changeset 1784 for box/chris/general/lib/raidfile/RaidFileRead.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/lib/raidfile/RaidFileRead.cpp (modified) (8 diffs)

box/chris/general/lib/raidfile/RaidFileRead.cpp

@@ -20 +20 @@
 #ifdef HAVE_SYS_UIO_H
         #include <sys/uio.h>
-#endif
-
-#ifdef HAVE_SYSLOG_H
-        #include <syslog.h>
 #endif
 
@@ -549 +545 @@
 void RaidFileRead_Raid::AttemptToRecoverFromIOError(bool Stripe1)
 {
-        TRACE3("Attempting to recover from I/O error: %d %s, on stripe %d\n", mSetNumber, mFilename.c_str(), Stripe1?1:2);
-        ::syslog(LOG_ERR | LOG_LOCAL5, "Attempting to recover from I/O error: %d %s, on stripe %d\n", mSetNumber, mFilename.c_str(), Stripe1?1:2);
+        BOX_WARNING("Attempting to recover from I/O error: " << mSetNumber <<
+                " " << mFilename << ", on stripe " << (Stripe1?1:2));
 
         // Close offending file
@@ -862 +858 @@
                         if(errno == EIO)
                         {
-                                TRACE3("I/O error when seeking in %d %s (to %d), stripe 1\n", mSetNumber, mFilename.c_str(), (int)FilePosition);
-                                ::syslog(LOG_ERR | LOG_LOCAL5, "I/O error when seeking in %d %s (to %d), stripe 1\n", mSetNumber, mFilename.c_str(), (int)FilePosition);
+                                BOX_ERROR("I/O error when seeking in " <<
+                                        mSetNumber << " " << mFilename <<
+                                        " (to " << FilePosition << "), " <<
+                                        "stripe 1");
                                 // Attempt to recover
                                 AttemptToRecoverFromIOError(true /* is stripe 1 */);
@@ -880 +878 @@
                         if(errno == EIO)
                         {
-                                TRACE3("I/O error when seeking in %d %s (to %d), stripe 2\n", mSetNumber, mFilename.c_str(), (int)FilePosition);
-                                ::syslog(LOG_ERR | LOG_LOCAL5, "I/O error when seeking in %d %s (to %d), stripe 2\n", mSetNumber, mFilename.c_str(), (int)FilePosition);
+                                BOX_ERROR("I/O error when seeking in " <<
+                                        mSetNumber << " " << mFilename <<
+                                        " (to " << FilePosition << "), " <<
+                                        "stripe 2");
                                 // Attempt to recover
                                 AttemptToRecoverFromIOError(false /* is stripe 2 */);
@@ -1055 +1055 @@
                 if(existance != RaidFileUtil::AsRaid)
                 {
-                        TRACE2("Opening %d %s in normal mode, but parity file doesn't exist\n", SetNumber, Filename.c_str());
-                        ::syslog(LOG_ERR | LOG_LOCAL5, "Opening %d %s in normal mode, but parity file doesn't exist\n", SetNumber, Filename.c_str());
+                        BOX_ERROR("Opening " << SetNumber << " " <<
+                                Filename << " in normal mode, but "
+                                "parity file doesn't exist");
                         // TODO: Alert recovery daemon
                 }
@@ -1131 +1132 @@
                         if(stripe1errno == EIO)
                         {
-                                TRACE2("I/O error on opening %d %s stripe 1, trying recovery mode\n", SetNumber, Filename.c_str());
-                                ::syslog(LOG_ERR | LOG_LOCAL5, "I/O error on opening %d %s stripe 1, trying recovery mode\n", SetNumber, Filename.c_str());
+                                BOX_ERROR("I/O error on opening " <<
+                                        SetNumber << " " << Filename <<
+                                        " stripe 1, trying recovery mode");
                                 RaidFileRead_Raid::MoveDamagedFileAlertDaemon(SetNumber, Filename, true /* is stripe 1 */);
 
@@ -1147 +1149 @@
                         if(stripe2errno == EIO)
                         {
-                                TRACE2("I/O error on opening %d %s stripe 2, trying recovery mode\n", SetNumber, Filename.c_str());
-                                ::syslog(LOG_ERR | LOG_LOCAL5, "I/O error on opening %d %s stripe 2, trying recovery mode\n", SetNumber, Filename.c_str());
+                                BOX_ERROR("I/O error on opening " <<
+                                        SetNumber << " " << Filename <<
+                                        " stripe 2, trying recovery mode");
                                 RaidFileRead_Raid::MoveDamagedFileAlertDaemon(SetNumber, Filename, false /* is stripe 2 */);
 
@@ -1170 +1173 @@
         if(existance == RaidFileUtil::AsRaidWithMissingReadable)
         {
-                TRACE3("Attempting to open RAID file %d %s in recovery mode (stripe %d present)\n", SetNumber, Filename.c_str(), (existingFiles & RaidFileUtil::Stripe1Exists)?1:2);
-                ::syslog(LOG_ERR | LOG_LOCAL5, "Attempting to open RAID file %d %s in recovery mode (stripe %d present)\n", SetNumber, Filename.c_str(), (existingFiles & RaidFileUtil::Stripe1Exists)?1:2);
+                BOX_ERROR("Attempting to open RAID file " << SetNumber <<
+                        " " << Filename << " in recovery mode (stripe " <<
+                        ((existingFiles & RaidFileUtil::Stripe1Exists)?1:2) <<
+                        " present)");
         
                 // Generate the filenames of all the lovely files