From 062cb52cbe7e9a24e665d97c5984a7ae247c40d4 Mon Sep 17 00:00:00 2001
From: Con Kolivas <kernel@kolivas.org>
Date: Thu, 5 Jan 2017 09:32:07 +1100
Subject: [PATCH] Abstract out get_timestamp.

---
 src/ckpool.c | 23 ++++++++++++++---------
 src/ckpool.h |  2 ++
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/ckpool.c b/src/ckpool.c
index 0974b44b..d290692a 100644
--- a/src/ckpool.c
+++ b/src/ckpool.c
@@ -81,20 +81,12 @@ static void proclog(ckpool_t *ckp, char *msg)
 	free(msg);
 }
 
-/* Log everything to the logfile, but display warnings on the console as well */
-void logmsg(int loglevel, const char *fmt, ...)
+void get_timestamp(char *stamp)
 {
-	int logfd = global_ckp->logfd;
-	char *log, *buf = NULL;
-	char stamp[128];
 	struct tm tm;
 	tv_t now_tv;
-	va_list ap;
 	int ms;
 
-	if (global_ckp->loglevel < loglevel || !fmt)
-		return;
-
 	tv_time(&now_tv);
 	ms = (int)(now_tv.tv_usec / 1000);
 	localtime_r(&(now_tv.tv_sec), &tm);
@@ -105,6 +97,18 @@ void logmsg(int loglevel, const char *fmt, ...)
 			tm.tm_hour,
 			tm.tm_min,
 			tm.tm_sec, ms);
+}
+
+/* Log everything to the logfile, but display warnings on the console as well */
+void logmsg(int loglevel, const char *fmt, ...)
+{
+	int logfd = global_ckp->logfd;
+	char *log, *buf = NULL;
+	char stamp[128];
+	va_list ap;
+
+	if (global_ckp->loglevel < loglevel || !fmt)
+		return;
 
 	va_start(ap, fmt);
 	VASPRINTF(&buf, fmt, ap);
@@ -118,6 +122,7 @@ void logmsg(int loglevel, const char *fmt, ...)
 		fprintf(stderr, "Zero length string sent to logmsg\n");
 		goto out;
 	}
+	get_timestamp(stamp);
 	if (loglevel <= LOG_ERR && errno != 0)
 		ASPRINTF(&log, "%s %s with errno %d: %s\n", stamp, buf, errno, strerror(errno));
 	else
diff --git a/src/ckpool.h b/src/ckpool.h
index fdf001b3..32792308 100644
--- a/src/ckpool.h
+++ b/src/ckpool.h
@@ -334,6 +334,8 @@ static const char __maybe_unused *stratum_msgs[] = {
 
 #define SAFE_HASH_OVERHEAD(HASHLIST) (HASHLIST ? HASH_OVERHEAD(hh, HASHLIST) : 0)
 
+void get_timestamp(char *stamp);
+
 ckmsgq_t *create_ckmsgq(ckpool_t *ckp, const char *name, const void *func);
 ckmsgq_t *create_ckmsgqs(ckpool_t *ckp, const char *name, const void *func, const int count);
 bool _ckmsgq_add(ckmsgq_t *ckmsgq, void *data, const char *file, const char *func, const int line);