diff --git a/scripts/run.sh b/scripts/run.sh index 7a2675d6e8fb1b27c4b3c0ff3afa576dbd230d64..ef52faf617fe73aceb27d8d68369d334c3e7cdc7 100755 --- a/scripts/run.sh +++ b/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..." diff --git a/src/Makefile b/src/Makefile index 20d0396acdd607c47bc402908b900b6064f76638..f4e68d682384f6ff1ed5cee2a67bdc16d6f0ee3f 100644 --- a/src/Makefile +++ b/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 diff --git a/src/log.h b/src/log.h index d8ffe15f41d44d78291badc27489b5fddf40acb3..ec7757d0a1b0dc3f82f8462010546ac11c8c78fa 100644 --- a/src/log.h +++ b/src/log.h @@ -84,12 +84,18 @@ inline std::ostream& operator<< (std::ostream& os, enum LOG_LEVEL severity) { switch (severity) { - case TRACE: return os << "TRACE " ; - case DEBUG: return os << "DEBUG "; - case INFO: return os << "INFO "; - case WARNING: return os << "WARNING "; - case ERROR: return os << "ERROR "; - case FATAL: return os << "FATAL "; + case TRACE: + return os << "<7> " ; + case DEBUG: + return os << "<7> "; + case INFO: + return os << "<6> "; + case WARNING: + return os << "<4> "; + case ERROR: + return os << "<3> "; + case FATAL: + return os << "<1> "; }; return os; }