From 3bcc2b43bad60adfc605104be5a017762f818b33 Mon Sep 17 00:00:00 2001
From: Ian Gulliver <flamingcow@gmail.com>
Date: Mon, 7 Mar 2016 17:38:18 -0800
Subject: [PATCH] Log more debug data.

---
 adsbus/.gitignore |  2 +-
 adsbus/Makefile   | 12 +++++++-----
 adsbus/log.c      |  2 +-
 adsbus/server.c   | 19 +++++++++++++++++--
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/adsbus/.gitignore b/adsbus/.gitignore
index e4375ec..14d0f0c 100644
--- a/adsbus/.gitignore
+++ b/adsbus/.gitignore
@@ -35,4 +35,4 @@
 adsbus
 
 # Generated
-version.h
+build.h
diff --git a/adsbus/Makefile b/adsbus/Makefile
index 85947a5..c311a8b 100644
--- a/adsbus/Makefile
+++ b/adsbus/Makefile
@@ -19,14 +19,16 @@ OBJ_PROTO = adsb.pb-c.o
 all: adsbus
 
 clean:
-	rm -rf *.o adsbus testout findings version.h
+	rm -rf *.o adsbus testout findings build.h
 
-%.o: %.c *.h
+%.o: %.c *.h build.h
 	$(COMP) -c $(CFLAGS) $< -o $@
 
-version.h:
-	echo "#define GIT_LAST_CHANGE \"$$(git log --format=%H -n 1)\"" > version.h
-	echo "#define GIT_LOCAL_CLEAN $$(git diff --exit-code > /dev/null && echo true || echo false)" >> version.h
+build.h:
+	echo "#define GIT_LAST_CHANGE \"$$(git log --format=%H -n 1)\"" > $@
+	echo "#define GIT_LOCAL_CLEAN $$(git diff --exit-code > /dev/null && echo true || echo false)" >> $@
+	echo "#define HOSTNAME \"$$(hostname --fqdn)\"" >> $@
+	echo "#define USERNAME \"$$(whoami)\"" >> $@
 
 adsb.pb-c.c: ../proto/adsb.proto
 	protoc-c --c_out=./ --proto_path=$(dir $<) $<
diff --git a/adsbus/log.c b/adsbus/log.c
index fb000fb..cfc7595 100644
--- a/adsbus/log.c
+++ b/adsbus/log.c
@@ -93,7 +93,7 @@ bool log_reopen(const char *path) {
 void log_write(char type, const char *loc, const uint8_t *id, const char *fmt, ...) {
 	va_list ap;
 	va_start(ap, fmt);
-	assert(fprintf(log_stream, "%c [%20s] %s: ", type, loc, id) > 0);
+	assert(fprintf(log_stream, "%c [%18s] %s: ", type, loc, id) > 0);
 	assert(vfprintf(log_stream, fmt, ap) > 0);
 	assert(fprintf(log_stream, "\n") == 1);
 	va_end(ap);
diff --git a/adsbus/server.c b/adsbus/server.c
index f154304..4c0bf68 100644
--- a/adsbus/server.c
+++ b/adsbus/server.c
@@ -1,8 +1,14 @@
+#include <jansson.h>
+#include <protobuf-c/protobuf-c.h>
+
+#include "build.h"
+#include "log.h"
 #include "uuid.h"
 
-#include "log.h"
 #include "server.h"
 
+#pragma GCC diagnostic ignored "-Wdate-time"
+
 uint8_t server_id[UUID_LEN];
 char server_version[] = "https://github.com/flamingcowtv/adsb-tools#1";
 
@@ -10,5 +16,14 @@ static char log_module = 'X';
 
 void server_init() {
 	uuid_gen(server_id);
-	LOG(server_id, "Server start");
+	LOG(server_id, "Server start:");
+	LOG(server_id, "\tgit_last_change: %s", GIT_LAST_CHANGE);
+	LOG(server_id, "\tgit_local_clean: %s", GIT_LOCAL_CLEAN ? "true" : "false");
+	LOG(server_id, "\tclang_version: %s", __clang_version__);
+	LOG(server_id, "\tglibc_version: %d.%d", __GLIBC__, __GLIBC_MINOR__);
+	LOG(server_id, "\tjansson_version: %s", JANSSON_VERSION);
+	LOG(server_id, "\tprotobuf-c_version: %s", PROTOBUF_C_VERSION);
+	LOG(server_id, "\tbuild_datetime: %s", __DATE__ " " __TIME__);
+	LOG(server_id, "\tbuild_username: %s", USERNAME);
+	LOG(server_id, "\tbuild_hostname: %s", HOSTNAME);
 }