jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-24 11:46:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'thingos/dev' into dev

Browse Source
This commit is contained in:
Calin Crisan 2019-03-26 22:57:40 +02:00
commit 3d3379c2a0
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/common/overlay/etc/init.d/S33hostapd
View File

@ -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

4
board/common/overlay/etc/init.d/S35wifi
View File

@ -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

4
board/common/overlay/etc/init.d/S36ppp
View File

@ -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

2
board/common/overlay/etc/init.d/S37bluetooth
View File

@ -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

12
board/common/overlay/etc/init.d/S40network
View File

@ -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

4
board/common/overlay/etc/init.d/S41netwatch
View File

@ -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

8
board/common/overlay/etc/init.d/S50date
View File

@ -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
}