Changeset 1243:7c5f662c4eef in freeDiameter for libfdproto

Timestamp:

Nov 11, 2013, 3:55:10 PM (10 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Shortened log timestamp format when DEBUG_WITHOUT_META is defined

File:

• libfdproto/log.c (modified) (3 diffs)

libfdproto/log.c

@@ -95 +95 @@
 
     /* add timestamp */
-    printf("%s  ", fd_log_time(NULL, buf, sizeof(buf)));
-    
+    printf("%s  ", fd_log_time(NULL, buf, sizeof(buf), 
+#if (defined(DEBUG) && !defined(DEBUG_WITHOUT_META))
+        1, 1
+#else /* (defined(DEBUG) && !defined(DEBUG_WITHOUT_META)) */
+        0, 0
+#endif /* (defined(DEBUG) && !defined(DEBUG_WITHOUT_META)) */
+            ));
     /* Use colors on stdout ? */
     if (!use_colors) {
@@ -184 +189 @@
 
 /* Write time into a buffer */
-char * fd_log_time ( struct timespec * ts, char * buf, size_t len )
+char * fd_log_time ( struct timespec * ts, char * buf, size_t len, int incl_date, int incl_ms )
 {
         int ret;
@@ -201 +206 @@
         }
         
-        offset += strftime(buf + offset, len - offset, "%D,%T", localtime_r( &ts->tv_sec , &tm ));
-        offset += snprintf(buf + offset, len - offset, ".%6.6ld", ts->tv_nsec / 1000);
+        offset += strftime(buf + offset, len - offset, incl_date?"%D,%T":"%T", localtime_r( &ts->tv_sec , &tm ));
+        if (incl_ms)
+                offset += snprintf(buf + offset, len - offset, ".%6.6ld", ts->tv_nsec / 1000);
 
         return buf;