diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/log.c | 59 | ||||
| -rw-r--r-- | src/core/platform.h | 9 |
2 files changed, 51 insertions, 17 deletions
diff --git a/src/core/log.c b/src/core/log.c index b560f6c7..cef3169c 100644 --- a/src/core/log.c +++ b/src/core/log.c @@ -58,17 +58,29 @@ nng_null_logger(nng_log_level level, nng_log_facility facility, } void -nng_stderr_logger(nng_log_level level, nng_log_facility facility, - const char *msgid, const char *msg) +stderr_logger(nng_log_level level, nng_log_facility facility, + const char *msgid, const char *msg, bool timechk) { const char *sgr, *sgr0; // Initial implementation. - bool colors = false; - const char *level_str; - time_t now; - char when[64]; + bool colors = false; + const char *level_str; + char when[64]; + struct tm *tm; + static struct tm last_log = { 0 }; + time_t now; + uint64_t sec; + uint32_t nsec; + NNI_ARG_UNUSED(facility); + if (nni_time_get(&sec, &nsec) != 0) { + // default to the epoch if we can't get a clock for some reason + sec = 0; + nsec = 0; + } + now = (time_t) sec; + #ifdef NNG_PLATFORM_WINDOWS // NB: We are blithely assuming the user has a modern console. colors = _isatty(_fileno(stderr)); @@ -79,7 +91,6 @@ nng_stderr_logger(nng_log_level level, nng_log_facility facility, colors = isatty(fileno(stderr)) && (getenv("TERM") != NULL) && (getenv("TERM")[0] != 0); #else - now = 0; colors = false; #endif @@ -92,15 +103,13 @@ nng_stderr_logger(nng_log_level level, nng_log_facility facility, (getenv("NO_COLOR") != NULL)) { colors = false; } - now = time(NULL); #ifdef NNG_HAVE_LOCALTIME_R - struct tm tm; + struct tm tm_buf; // No timezone offset, not strictly ISO8601 compliant - strftime(when, sizeof(when), "%Y-%m-%d %T", localtime_r(&now, &tm)); + tm = localtime_r(&now, &tm_buf); #else - strftime(when, sizeof(when), "%Y-%m-%d %T", localtime(&now)); + tm = localtime(&now); #endif - switch (level) { case NNG_LOG_ERR: sgr = "\x1b[31m"; // red @@ -139,8 +148,30 @@ nng_stderr_logger(nng_log_level level, nng_log_facility facility, sgr0 = ""; } - (void) fprintf(stderr, "%s[%-6s]: %s: %s%s%s%s\n", sgr, level_str, - when, msgid ? msgid : "", msgid ? ": " : "", msg, sgr0); + if (timechk && + ((last_log.tm_mday != tm->tm_mday) || + (last_log.tm_mon != tm->tm_mon) || + (last_log.tm_year != tm->tm_year))) { + char new_day[64]; + strftime(new_day, sizeof(new_day), + "Date changed to %Y-%m-%d, TZ is %z", tm); + stderr_logger( + NNG_LOG_DEBUG, facility, "NNG-DATE", new_day, false); + last_log = *tm; + } + + strftime(when, sizeof(when), "%H:%M:%S", tm); + // we print with millisecond resolution + (void) fprintf(stderr, "%s[%-6s]: %s.%03d: %s%s%s%s\n", sgr, level_str, + when, nsec / 1000000, msgid ? msgid : "", msgid ? ": " : "", msg, + sgr0); +} + +void +nng_stderr_logger(nng_log_level level, nng_log_facility facility, + const char *msgid, const char *msg) +{ + stderr_logger(level, facility, msgid, msg, true); } void diff --git a/src/core/platform.h b/src/core/platform.h index 2e6c7eb8..53ef53af 100644 --- a/src/core/platform.h +++ b/src/core/platform.h @@ -234,8 +234,8 @@ extern bool nni_atomic_cas(nni_atomic_int *, int, int); // atomic pointers. We only support a few operations. typedef struct nni_atomic_ptr nni_atomic_ptr; -extern void nni_atomic_set_ptr(nni_atomic_ptr *, void *); -extern void *nni_atomic_get_ptr(nni_atomic_ptr *); +extern void nni_atomic_set_ptr(nni_atomic_ptr *, void *); +extern void *nni_atomic_get_ptr(nni_atomic_ptr *); // // Clock Support @@ -249,6 +249,9 @@ extern void *nni_atomic_get_ptr(nni_atomic_ptr *); // option of using negative values for other purposes in the future.) extern nni_time nni_clock(void); +// Get the real time, in seconds and nanoseconds +extern int nni_time_get(uint64_t *seconds, uint32_t *nanoseconds); + // nni_msleep sleeps for the specified number of milliseconds (at least). extern void nni_msleep(nni_duration); @@ -445,7 +448,7 @@ extern int nni_plat_udp_sockname(nni_plat_udp *, nni_sockaddr *); // in APIs to transport file descriptors, or across a fork/exec boundary (so // that child processes may use these with socket to inherit a socket that is // connected to the parent.) -extern int nni_socket_pair(int [2]); +extern int nni_socket_pair(int[2]); // // File/Store Support |