diff options
Diffstat (limited to 'script/uactivity/watchdog')
| -rwxr-xr-x | script/uactivity/watchdog/#10-syslog_demo | 42 | ||||
| -rwxr-xr-x | script/uactivity/watchdog/#20-yaUSBir_watchdog | 3 |
2 files changed, 27 insertions, 18 deletions
diff --git a/script/uactivity/watchdog/#10-syslog_demo b/script/uactivity/watchdog/#10-syslog_demo index 8ff6ca3..bcb36b7 100755 --- a/script/uactivity/watchdog/#10-syslog_demo +++ b/script/uactivity/watchdog/#10-syslog_demo @@ -1,41 +1,49 @@ #!/bin/sh -case "${1}" in +case "${UACTIVITY_ORGIN}" in startup) logger -t "uactivity [watchdog/$(basename ${0})]" "watchdog starting up" - [ "${2}" = "true" ] \ + [ "${UACTIVITY_INFO_ACTIVITY}" = "true" ] \ && logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user active\"" \ || logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user inactive\"" - logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${3}" - logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${4}" - logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${5}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}" ;; started) logger -t "uactivity [watchdog/$(basename ${0})]" "watchdog started" - [ "${2}" = "true" ] \ + [ "${UACTIVITY_INFO_ACTIVITY}" = "true" ] \ && logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user active\"" \ || logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user inactive\"" - logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${3}" - logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${4}" - logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${5}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}" ;; shutdown) logger -t "uactivity [watchdog/$(basename ${0})]" "watchdog shutting down" - [ "${2}" = "true" ] \ + [ "${UACTIVITY_INFO_ACTIVITY}" = "true" ] \ && logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user active\"" \ || logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user inactive\"" - logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${3}" - logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${4}" - logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${5}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}" ;; running) logger -t "uactivity [watchdog/$(basename ${0})]" "watchdog triggered" - [ "${2}" = "true" ] \ + [ "${UACTIVITY_INFO_ACTIVITY}" = "true" ] \ && logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user active\"" \ || logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user inactive\"" - logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${3}" - logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${4}" - logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${5}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory: ${UACTIVITY_CONFIGDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory: ${UACTIVITY_CACHEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "Key: ${UACTIVITY_INFO_KEY}" + logger -t "uactivity [watchdog/$(basename ${0})]" "VideoDirectory: ${UACTIVITY_INFO_VIDEODIR}" ;; esac diff --git a/script/uactivity/watchdog/#20-yaUSBir_watchdog b/script/uactivity/watchdog/#20-yaUSBir_watchdog index d6e70dc..4307a55 100755 --- a/script/uactivity/watchdog/#20-yaUSBir_watchdog +++ b/script/uactivity/watchdog/#20-yaUSBir_watchdog @@ -13,6 +13,7 @@ IRSEND="irsend -d /var/run/lirc/ya_usbir SEND_ONCE yaUsbIR_control C_WATCHDOG %s trigger_watchdog(){ # Calculate n1, n2 and n3 values + OK=false eval $(bc <<EOF 2> /dev/null watchdog = ${WATCHDOG_TIME} @@ -57,7 +58,7 @@ deactivate_watchdog(){ -case "${1}" in +case "${UACTIVITY_ORGIN}" in startup) trigger_watchdog || exit 1 ;; |