Skip to content

WAT-005 Consolidating log output #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cytopia merged 1 commit into from
Sep 26, 2017
Merged

WAT-005 Consolidating log output #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions watcherd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,12 @@ function action() {

if eval "${action}"; then
if [ "${verbose}" -gt "0" ]; then
printf "[%s] [OK] %s succeeded: %s\n" "$( date '+%Y-%m-%d %H:%M:%S' )" "${info}" "${directory}"
printf "%s: [%s] [OK] %s succeeded: %s\n" "${MY_NAME}" "$( date '+%Y-%m-%d %H:%M:%S' )" "${info}" "${directory}"
fi
return 0
else
if [ "${verbose}" -gt "0" ]; then
printf "[%s] [ERR] %s failed: %s\n" "$( date '+%Y-%m-%d %H:%M:%S' )" "${info}" "${directory}"
printf "%s: [%s] [ERR] %s failed: %s\n" "${MY_NAME}" "$( date '+%Y-%m-%d %H:%M:%S' )" "${info}" "${directory}"
fi
return 1
fi
Expand All @@ -140,12 +140,12 @@ function trigger() {
if [ "${changes}" -eq "1" ]; then
if eval "${action}"; then
if [ "${verbose}" -gt "0" ]; then
printf "[%s] [OK] %s succeeded: %s\n" "$( date '+%Y-%m-%d %H:%M:%S' )" "TRIGGER" "${action}"
printf "%s: [%s] [OK] %s succeeded: %s\n" "${MY_NAME}" "$( date '+%Y-%m-%d %H:%M:%S' )" "TRIGGER" "${action}"
fi
return 0
else
if [ "${verbose}" -gt "0" ]; then
printf "[%s] [ERR] %s failed: %s\n" "$( date '+%Y-%m-%d %H:%M:%S' )" "TRIGGER" "${action}"
printf "%s: [%s] [ERR] %s failed: %s\n" "${MY_NAME}" "$( date '+%Y-%m-%d %H:%M:%S' )" "TRIGGER" "${action}"
fi
# Also return 0 here in order to not abort the loop
return 0
Expand Down Expand Up @@ -256,8 +256,13 @@ fi
# Main entrypoint
############################################################

CHANGES=0
# Log startup
if [ "${VERBOSE}" -gt "0" ]; then
printf "%s: [%s] Starting daemon.\n" "${MY_NAME}" "$( date '+%Y-%m-%d %H:%M:%S' )"
fi


CHANGES=0
ALL_DIRS="$( get_subdirs "${WATCH_DIR}" )"

if [ "${WITHOUT_SUBSHELL}" -eq "1" ]; then
Expand All @@ -283,7 +288,7 @@ CHANGES=0
# Use native inotify
if [ "${WATCHER}" = "inotify" ]; then
if [ "${VERBOSE}" -gt "0" ]; then
echo "Using native inotify to watch for changes."
printf "%s: [%s] Using native inotify to watch for changes.\n" "${MY_NAME}" "$( date '+%Y-%m-%d %H:%M:%S' )"
fi
inotifywait \
--quiet \
Expand All @@ -308,7 +313,7 @@ if [ "${WATCHER}" = "inotify" ]; then
# Use custom inotify
else
if [ "${VERBOSE}" -gt "0" ]; then
echo "Using bash loop to watch for changes."
printf "%s: [%s] Using bash loop to watch for changes.\n" "${MY_NAME}" "$( date '+%Y-%m-%d %H:%M:%S' )"
fi
while true; do
# Get all directories
Expand Down