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

Fixed a bug where tail processes would not die.

Browse Source
This commit is contained in:
Marcus Whybrow 2012-06-05 23:18:40 +01:00
parent a7aee94e63
commit 93ba2c12f4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
init/msm
View File

@ -443,7 +443,7 @@ server_log_get_line() {
fi fi
done done
fi fi
done < <(as_user "${server_user_name[$1]}" "tail --follow --lines=100 --sleep-interval=0.1 \"${server_log[$1]}\"") done < <(as_user "${server_user_name[$1]}" "tail --pid=$$ --follow --lines=100 --sleep-interval=0.1 \"${server_log[$1]}\"")
} }
# The same as server_log_get_line, but does not print the line to stdout # The same as server_log_get_line, but does not print the line to stdout
@ -2219,7 +2219,7 @@ main() {
if server_is_running "$id"; then if server_is_running "$id"; then
server_eval "$id" "${*:3}" server_eval "$id" "${*:3}"
echo "Now watching logs (press Ctrl+C to exit):" echo "Now watching logs (press Ctrl+C to exit):"
as_user "${server_user_name[$id]}" "tail --follow --lines=0 --sleep-interval=0.1 ${server_log[$id]}" as_user "${server_user_name[$id]}" "tail --pid=$$ --follow --lines=0 --sleep-interval=0.1 ${server_log[$id]}"
else else
error_exit SERVER_STOPPED "Server \"${server_name[$id]}\" is not running." error_exit SERVER_STOPPED "Server \"${server_name[$id]}\" is not running."
fi fi