Skip to content
Snippets Groups Projects
Commit 851bc6f2 authored by Dinyar Rabady's avatar Dinyar Rabady
Browse files

Format log messages for journald consumption

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

Belongs to #19.
parent 5fdc4394
No related branches found
No related tags found
No related merge requests found
...@@ -14,7 +14,7 @@ umask 000 # Files and folders we create should be world accessible ...@@ -14,7 +14,7 @@ umask 000 # Files and folders we create should be world accessible
while true while true
do do
echo "Starting scdaq..." 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..." echo "Resetting the board..."
../scripts/reset-firmware.sh ../scripts/reset-firmware.sh
echo "Clearing caches..." echo "Clearing caches..."
......
...@@ -27,7 +27,7 @@ CXXFLAGS = -std=c++11 -Wall -Wextra -O0 -g -rdynamic -Wconversion ...@@ -27,7 +27,7 @@ CXXFLAGS = -std=c++11 -Wall -Wextra -O0 -g -rdynamic -Wconversion
#CXXFLAGS = -std=c++11 -Wall -Wextra -g -rdynamic #CXXFLAGS = -std=c++11 -Wall -Wextra -g -rdynamic
CFLAGS = $(CXXFLAGS) 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 CPPFLAGS = -I. -Iwzdma
......
...@@ -82,17 +82,17 @@ namespace log { ...@@ -82,17 +82,17 @@ namespace log {
inline std::ostream &operator<<(std::ostream &os, enum LOG_LEVEL severity) { inline std::ostream &operator<<(std::ostream &os, enum LOG_LEVEL severity) {
switch (severity) { switch (severity) {
case TRACE: case TRACE:
return os << "TRACE "; return os << "<7> ";
case DEBUG: case DEBUG:
return os << "DEBUG "; return os << "<7> ";
case INFO: case INFO:
return os << "INFO "; return os << "<6> ";
case WARNING: case WARNING:
return os << "WARNING "; return os << "<4> ";
case ERROR: case ERROR:
return os << "ERROR "; return os << "<3> ";
case FATAL: case FATAL:
return os << "FATAL "; return os << "<1> ";
}; };
return os; return os;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment