Diff: MessageLogger/MessageLogger.cpp

Revision:

78:6c2b8ade8414

Parent:

77:db3384071634

--- a/MessageLogger/MessageLogger.cpp	Wed Apr 26 21:58:08 2017 +0000
+++ b/MessageLogger/MessageLogger.cpp	Thu Apr 27 17:09:50 2017 +0000
@@ -19,7 +19,7 @@
         // public methods:
         void MessageLogger::SendError(string errorMessage)
         {
-            fatalError << errorMessage <<"\n\rTerminating Program...\n\r";
+            fatalError << "ERROR: " << errorMessage << "\n\rTerminating Program...";
             loggingThread->signal_set(SIGNAL_printMessage);
             hasError = true;
         }
@@ -30,7 +30,7 @@
                         
             if (messageObj == NULL) 
             {
-               SendError("ERROR: Message queue is full.");
+               SendError("Message queue is full.");
                return;   
             }
             
@@ -43,7 +43,7 @@
             {
                 message_mail.free(messageObj);
                 ostringstream error;
-                error << "ERROR CODE: " << stat << ", Failed to retrieve message from queue";
+                error << stat << " - Failed to retrieve message from queue";
                 SendError(error.str());
                 return;
             }
@@ -57,6 +57,7 @@
             if(hasError)
             {
                 PrintError();
+                hasError = false;
                 return true;
             }
             return false;
@@ -73,7 +74,7 @@
         
         void MessageLogger::PrintError()
         {
-            printf("%s", fatalError.str());
+            printf("%s\n\r", fatalError.str().c_str());
         }
         
         void MessageLogger::PrintMessage()
@@ -87,7 +88,7 @@
                 
                 // Ask about cout as everyone on the internet recommends it as a type safe version of printf.
                 //std::cout << message; 
-                printf("%s", (*message));
+                printf((*message).c_str());
                 
                 message_mail.free(message);
                 messageCount--;
@@ -95,7 +96,7 @@
             else 
             {
                 ostringstream error;
-                error << "ERROR CODE: " << evt.status << ", Failed to retrieve message from queue";
+                error << evt.status << " - Failed to retrieve message from queue";
                 SendError(error.str());
             }  
         }
\ No newline at end of file