Changeset 30082

Timestamp:

Dec 17, 2010, 9:11:47 AM (15 years ago)

Author:

eugene

Message:

a bit clearer log msg formatting

File:

• branches/eam_branches/ipp-20101205/psLib/src/sys/psLogMsg.c (modified) (2 diffs)

branches/eam_branches/ipp-20101205/psLib/src/sys/psLogMsg.c

@@ -310 +310 @@
             *head_ptr++ = '|';
         }
-        maxLength -= snprintf(head_ptr, maxLength, "%s", name);
+        maxLength -= snprintf(head_ptr, maxLength, "%s\n", name);
 
         head_ptr += strlen(head_ptr);
     }
-
     if (head_ptr > head) {
-        *head_ptr++ = '\n';
-    } else if (!logMsg) {                  // no output desired
+        *head_ptr++ = '|';
+    }
+
+    // XXX rather than putting in a return for the message, let's only put in the return if we asked for the function name
+    if ((head_ptr == head) && !logMsg) { // no output desired
         return;
     }
@@ -332 +334 @@
         char *line = strtok_r(msg, "\n", &msgPtr);
         while (line) {
-            if(write(logFD, "    ", 4)) {;} // ignore return value
+            if(write(logFD, "          ", PS_MIN(level, 10))) {;} // ignore return value
             if(write(logFD, line, strlen(line))) {;} // ignore return value
             if(write(logFD, "\n", 1)) {;} // ignore return value