Changeset 340 for cpp/common

Timestamp:

03/24/15 20:51:28 (10 years ago)

Author:

Maciej Komosinski

Message:

New "pattern" for all messages

Location:

cpp/common

Files:

• framsg.cpp (modified) (2 diffs)
• framsg.h (modified) (1 diff)

cpp/common/framsg.cpp

@@ -8 +8 @@
 #include "Convert.h"
 
-const char* MSG_LEVEL[]={"DEBUG","INFO","WARN","ERROR","CRITICAL"};
+const char* MSG_LEVEL[]={"[DEBUG] ","","[WARN] ","[ERROR] ","[CRITICAL] "};
 
 void FramMessage(const char *o, const char *m, const char *txt, int w)
@@ -29 +29 @@
                 }
                 else //consecutive lines from multi-line
-                        _FramMessageSingleLine(o, m, ("..." + string(txt, nextsep - txt)).c_str(), w); //could also add line numbers like ...(3)... but let's keep the prefix short and simple
+                        _FramMessageSingleLine(o, m, (FRAMSG_MULTILINE_CONTINUATION + string(txt, nextsep - txt)).c_str(), w); //could also add line numbers like ...(3)... but let's keep the prefix short and simple
                 line++;
                 if ((nextsep[0] == '\r') && (nextsep[1] == '\n'))

cpp/common/framsg.h

@@ -9 +9 @@
 
 extern const char* MSG_LEVEL[];
-#define FRAMSG_FORMAT "[%s] %s.%s: %s"
+#define FRAMSG_FORMAT "%s%s.%s: %s"
+#define FRAMSG_MULTILINE_CONTINUATION "..."
 
 void FMprintf(const char *o,const char *m,int w,const char *bl, ...);