Mirrored_Repos/msm
1
0
Fork 0
mirror of https://github.com/msmhq/msm.git synced 2024-08-30 18:12:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add retry to tail, for cases where server rolls own log.

Browse Source
This commit is contained in:
Tristan Donkers 2015-08-15 02:39:47 +10:00
parent 6386814d46
commit d2467fba9a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
init/msm
View File

@ -826,7 +826,7 @@ server_log_get_line() {
RETURN="${BASH_REMATCH[1]}" RETURN="${BASH_REMATCH[1]}"
return 0 return 0
fi fi
done < <(as_user "${SERVER_USERNAME[$1]}" "tail --pid=$$ --follow --lines=20 --sleep-interval=0.1 \"${SERVER_LOG_PATH[$1]}\"") done < <(as_user "${SERVER_USERNAME[$1]}" "tail --pid=$$ --follow=name --retry --lines=20 --sleep-interval=0.1 \"${SERVER_LOG_PATH[$1]}\"")
} }
# The same as server_log_get_line, but prints a dot instead of the log line # The same as server_log_get_line, but prints a dot instead of the log line
@ -865,7 +865,7 @@ server_log_dots_for_lines() {
return 0 return 0
fi fi
fi fi
done < <(as_user "${SERVER_USERNAME[$1]}" "tail --pid=$$ --follow --lines=100 --sleep-interval=0.1 \"${SERVER_LOG_PATH[$1]}\"") done < <(as_user "${SERVER_USERNAME[$1]}" "tail --pid=$$ --follow=name --retry --lines=100 --sleep-interval=0.1 \"${SERVER_LOG_PATH[$1]}\"")
} }
# Sends as string to a server for execution # Sends as string to a server for execution
@ -3150,7 +3150,7 @@ command_server_cmdlog() {
echo "Now watching logs (press Ctrl+C to exit):" echo "Now watching logs (press Ctrl+C to exit):"
echo "..." echo "..."
server_eval "$1" "${*:2}" server_eval "$1" "${*:2}"
as_user "${SERVER_USERNAME[$1]}" "tail --pid=$$ --follow --lines=5 --sleep-interval=0.1 ${SERVER_LOG_PATH[$1]}" as_user "${SERVER_USERNAME[$1]}" "tail --pid=$$ --follow=name --retry --lines=5 --sleep-interval=0.1 ${SERVER_LOG_PATH[$1]}"
else else
error_exit SERVER_STOPPED "Server \"${SERVER_NAME[$1]}\" is not running." error_exit SERVER_STOPPED "Server \"${SERVER_NAME[$1]}\" is not running."
fi fi