Format log messages for journald consumption

Additionally remove logger at output, this doesn't appear to be
necessary.

Belongs to #19.

scripts/run.sh

@@ -14,7 +14,7 @@ umask 000 # Files and folders we create should be world accessible
 while true 
 do
     echo "Starting scdaq..."
-    /opt/scdaq/bin/scdaq --config /etc/scdaq/scdaq.conf 2>&1 | logger --tag scdaq --id -p user.debug
+    /opt/scdaq/bin/scdaq --config /etc/scdaq/scdaq.conf 2>&1
     echo "Resetting the board..."
     ../scripts/reset-firmware.sh
     echo "Clearing caches..."

src/Makefile

@@ -27,7 +27,7 @@ CXXFLAGS = -std=c++11 -Wall -Wextra -O0 -g -rdynamic -Wconversion
 #CXXFLAGS = -std=c++11 -Wall -Wextra -g -rdynamic
 
 CFLAGS = $(CXXFLAGS)
-LDFLAGS = -Llibmicron -ltbb -ltbbmalloc -lboost_thread -lboost_chrono -lcurl -lpthread -lcrypto 
+LDFLAGS = -Llibmicron -ltbb -ltbbmalloc -lboost_thread -lboost_chrono -lcurl -lpthread -lcrypto
 
 CPPFLAGS = -I. -Iwzdma
 

src/log.h

@@ -84,17 +84,17 @@ namespace log {
 inline std::ostream &operator<<(std::ostream &os, enum LOG_LEVEL severity) {
   switch (severity) {
   case TRACE:
-    return os << "TRACE   ";
+    return os << "<7> ";
   case DEBUG:
-    return os << "DEBUG   ";
+    return os << "<7> ";
   case INFO:
-    return os << "INFO    ";
+    return os << "<6> ";
   case WARNING:
-    return os << "WARNING ";
+    return os << "<4> ";
   case ERROR:
-    return os << "ERROR   ";
+    return os << "<3> ";
   case FATAL:
-    return os << "FATAL   ";
+    return os << "<1> ";
   };
   return os;
 }