From a915ed3ae38f9325d25aab611ba37b6387826f98 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Tue, 26 Mar 2019 22:57:21 +0200 Subject: [PATCH] logger: do not log to stdout/stderr --- board/common/overlay/etc/init.d/S33hostapd | 2 +- board/common/overlay/etc/init.d/S35wifi | 4 ++-- board/common/overlay/etc/init.d/S36ppp | 4 ++-- board/common/overlay/etc/init.d/S37bluetooth | 2 +- board/common/overlay/etc/init.d/S40network | 12 ++++++------ board/common/overlay/etc/init.d/S41netwatch | 4 ++-- board/common/overlay/etc/init.d/S50date | 8 ++++---- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/board/common/overlay/etc/init.d/S33hostapd b/board/common/overlay/etc/init.d/S33hostapd index e864dd0ff1..01bec9ee05 100755 --- a/board/common/overlay/etc/init.d/S33hostapd +++ b/board/common/overlay/etc/init.d/S33hostapd @@ -31,7 +31,7 @@ watch() { while true; do sleep 5 if ! running; then - logger -t hostapd -s "dead, calling panic action" + logger -t hostapd "dead, calling panic action" panic_action hostapd break fi diff --git a/board/common/overlay/etc/init.d/S35wifi b/board/common/overlay/etc/init.d/S35wifi index a215c977fe..b154042892 100755 --- a/board/common/overlay/etc/init.d/S35wifi +++ b/board/common/overlay/etc/init.d/S35wifi @@ -42,9 +42,9 @@ watch() { else if [[ ${count} -lt ${LINK_WATCH_TIMEOUT} ]]; then count=$((${count} + 5)) - logger -t wifi -s "disconnected" + logger -t wifi "disconnected" else - logger -t wifi -s "disconnected for ${LINK_WATCH_TIMEOUT} seconds, calling panic action" + logger -t wifi "disconnected for ${LINK_WATCH_TIMEOUT} seconds, calling panic action" panic_action wifi fi fi diff --git a/board/common/overlay/etc/init.d/S36ppp b/board/common/overlay/etc/init.d/S36ppp index 9186e6e926..969eb5f9fb 100755 --- a/board/common/overlay/etc/init.d/S36ppp +++ b/board/common/overlay/etc/init.d/S36ppp @@ -37,9 +37,9 @@ watch() { else if [[ ${count} -lt ${LINK_WATCH_TIMEOUT} ]]; then count=$((${count} + 5)) - logger -t ppp -s "disconnected" + logger -t ppp "disconnected" else - logger -t ppp -s "disconnected for ${LINK_WATCH_TIMEOUT} seconds, calling panic action" + logger -t ppp "disconnected for ${LINK_WATCH_TIMEOUT} seconds, calling panic action" panic_action ppp fi fi diff --git a/board/common/overlay/etc/init.d/S37bluetooth b/board/common/overlay/etc/init.d/S37bluetooth index 16cc5eab45..fce2fd6292 100755 --- a/board/common/overlay/etc/init.d/S37bluetooth +++ b/board/common/overlay/etc/init.d/S37bluetooth @@ -44,7 +44,7 @@ start() { count=$((${count} + 1)) if [[ ${count} -ge 10 ]]; then msg_fail "no device" - logger -t bluetooth -s "bluetooth device not available, calling panic action" + logger -t bluetooth "bluetooth device not available, calling panic action" panic_action bluetooth return 1 fi diff --git a/board/common/overlay/etc/init.d/S40network b/board/common/overlay/etc/init.d/S40network index c4ea325b29..b2ce067576 100755 --- a/board/common/overlay/etc/init.d/S40network +++ b/board/common/overlay/etc/init.d/S40network @@ -28,9 +28,9 @@ watch_eth() { else if [[ ${count} -lt ${LINK_WATCH_TIMEOUT} ]]; then count=$((${count} + 5)) - logger -t ethernet -s "disconnected" + logger -t ethernet "disconnected" else - logger -t ethernet -s "disconnected for ${LINK_WATCH_TIMEOUT} seconds, calling panic action" + logger -t ethernet "disconnected for ${LINK_WATCH_TIMEOUT} seconds, calling panic action" panic_action network fi fi @@ -47,9 +47,9 @@ watch_ip() { else if [[ ${count} -lt ${IP_WATCH_TIMEOUT} ]]; then count=$((${count} + 5)) - logger -t network -s "${iface} has no IP address" + logger -t network "${iface} has no IP address" else - logger -t network -s "${iface} had no IP address for ${IP_WATCH_TIMEOUT} seconds, calling panic action" + logger -t network "${iface} had no IP address for ${IP_WATCH_TIMEOUT} seconds, calling panic action" panic_action network fi fi @@ -176,11 +176,11 @@ start() { if [[ "${eth_ok}" != "ok" ]] && [[ "${wlan_ok}" != "ok" ]] && [[ "${ppp_ok}" != "ok" ]]; then if [[ "${LINK_WATCH}" == "true" ]]; then - logger -t network -s "no network connection available, calling panic action" + logger -t network "no network connection available, calling panic action" panic_action network return 1 else - logger -t network -s "no network connection available" + logger -t network "no network connection available" return 0 fi fi diff --git a/board/common/overlay/etc/init.d/S41netwatch b/board/common/overlay/etc/init.d/S41netwatch index f452c0bab8..787ea39b5b 100755 --- a/board/common/overlay/etc/init.d/S41netwatch +++ b/board/common/overlay/etc/init.d/S41netwatch @@ -28,11 +28,11 @@ watch() { count=0 else if [[ ${count} -lt ${NETWATCH_RETRIES} ]]; then - logger -t netwatch -s "cannot connect to ${NETWATCH_HOST}:${NETWATCH_PORT}" + logger -t netwatch "cannot connect to ${NETWATCH_HOST}:${NETWATCH_PORT}" count=$((${count} + 1)) continue else - logger -t netwatch -s "cannot connect to ${NETWATCH_HOST}:${NETWATCH_PORT}, calling panic action" + logger -t netwatch "cannot connect to ${NETWATCH_HOST}:${NETWATCH_PORT}, calling panic action" panic_action netwatch fi fi diff --git a/board/common/overlay/etc/init.d/S50date b/board/common/overlay/etc/init.d/S50date index 5cd0781abf..930eefe382 100755 --- a/board/common/overlay/etc/init.d/S50date +++ b/board/common/overlay/etc/init.d/S50date @@ -35,10 +35,10 @@ set_current_date_http() { date_str=$(curl -v -s -m ${DATE_TIMEOUT} -X GET http://${DATE_HOST} 2>&1 | grep Date | sed -e 's/< Date: //') if [[ -n "${date_str}" ]]; then ${PROG_DATE} -u -D "%a, %d %b %Y %H:%M:%S" -s "${date_str}" > /dev/null - logger -t date -s "current system date/time set to $(date) via HTTP" + logger -t date "current system date/time set to $(date) via HTTP" return 0 else - logger -t date -s "failed to set current system date/time via HTTP" + logger -t date "failed to set current system date/time via HTTP" return 1 fi } @@ -46,10 +46,10 @@ set_current_date_http() { set_current_date_ntp() { cat ${NTP_CONF} | grep server | head -n 1 | cut -d ' ' -f 2 | xargs ${PROG_NTPDATE} -t ${DATE_TIMEOUT} -s if [[ $? == 0 ]]; then - logger -t date -s "current system date/time set to $(date) via NTP" + logger -t date "current system date/time set to $(date) via NTP" return 0 else - logger -t date -s "failed to set current system date/time via NTP" + logger -t date "failed to set current system date/time via NTP" return 1 fi }