summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Levand <geoff@infradead.org>2018-08-13 09:23:07 -0700
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>2018-08-14 11:10:07 +1000
commit3b4f88057e95418bc548542b5b9a13910905c93d (patch)
tree69ffe6aeb9b334576b93772486032808c5c6144c
parent4b906ba9ad0e19e5b9fcafdaa1318f7642e578a1 (diff)
downloadtalos-petitboot-3b4f88057e95418bc548542b5b9a13910905c93d.tar.gz
talos-petitboot-3b4f88057e95418bc548542b5b9a13910905c93d.zip
pb_log: Break out timestamp
Fixes double timestamp on pb_log_fn, pb_debug_fn. Signed-off-by: Geoff Levand <geoff@infradead.org> Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
-rw-r--r--lib/log/log.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/log/log.c b/lib/log/log.c
index 5466d81..7f14232 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -9,7 +9,7 @@
static FILE *logf;
static bool debug;
-static void __log(const char *fmt, va_list ap)
+static void __log_timestamp(void)
{
char hms[20] = {'\0'};
time_t t;
@@ -17,10 +17,15 @@ static void __log(const char *fmt, va_list ap)
if (!logf)
return;
- /* Add timestamp */
t = time(NULL);
strftime(hms, sizeof(hms), "%T", localtime(&t));
fprintf(logf, "[%s] ", hms);
+}
+
+static void __log(const char *fmt, va_list ap)
+{
+ if (!logf)
+ return;
vfprintf(logf, fmt, ap);
fflush(logf);
@@ -30,6 +35,7 @@ void pb_log(const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
+ __log_timestamp();
__log(fmt, ap);
va_end(ap);
}
@@ -49,6 +55,7 @@ void pb_debug(const char *fmt, ...)
if (!debug)
return;
va_start(ap, fmt);
+ __log_timestamp();
__log(fmt, ap);
va_end(ap);
}
OpenPOWER on IntegriCloud