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 some case errors in function names.

Browse Source
This commit is contained in:
Marcus Whybrow 2012-06-28 15:47:41 +01:00
parent fcc06ea9d8
commit e661983e88
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
init/msm
View File

@ -420,7 +420,7 @@ server_worlds_to_disk() {
# $2: A UNIX timestamp (seconds since 1970) which the $3 line must be after # $2: A UNIX timestamp (seconds since 1970) which the $3 line must be after
# $3->: The line or lines in the log to wait for # $3->: The line or lines in the log to wait for
# returns: When the line is found # returns: When the line is found
SERVER_LOG_get_line() { server_log_get_line() {
# Make sure there is a server log to check # Make sure there is a server log to check
as_user "${SERVER_USER_NAME[$1]}" "touch ${SERVER_LOG[$1]}" as_user "${SERVER_USER_NAME[$1]}" "touch ${SERVER_LOG[$1]}"
@ -441,10 +441,10 @@ SERVER_LOG_get_line() {
done < <(as_user "${SERVER_USER_NAME[$1]}" "tail --pid=$$ --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
# when found. # when found.
SERVER_LOG_wait_for_line() { server_log_wait_for_line() {
SERVER_LOG_get_line "$@" > /dev/null server_log_get_line "$@" > /dev/null
} }
# Sends as string to a server for execution # Sends as string to a server for execution
@ -462,7 +462,7 @@ server_eval() {
server_eval_and_get_line() { server_eval_and_get_line() {
time_now="$(now)" time_now="$(now)"
server_eval "$1" "$2" server_eval "$1" "$2"
SERVER_LOG_get_line "$1" "$time_now" "${@:3}" server_log_get_line "$1" "$time_now" "${@:3}"
} }
# The same as server_eval_and_get_line, but does not print anything to stdout # The same as server_eval_and_get_line, but does not print anything to stdout
@ -775,7 +775,7 @@ server_start() {
printf "Starting server... " printf "Starting server... "
as_user "${SERVER_USER_NAME[$1]}" "cd \"${SERVER_PATH[$1]}\" && screen -dmS \"${SERVER_SCREEN_NAME[$1]}\" ${SERVER_INVOCATION[$1]}" as_user "${SERVER_USER_NAME[$1]}" "cd \"${SERVER_PATH[$1]}\" && screen -dmS \"${SERVER_SCREEN_NAME[$1]}\" ${SERVER_INVOCATION[$1]}"
SERVER_LOG_wait_for_line "$1" "$time_now" "${SERVER_CONFIRM_START[$1]}" server_log_wait_for_line "$1" "$time_now" "${SERVER_CONFIRM_START[$1]}"
echo "Done." echo "Done."
fi fi
@ -953,7 +953,7 @@ server_worlds_backup() {
# Moves a servers log into another file, leaving the original log file empty # Moves a servers log into another file, leaving the original log file empty
# $1: The ID of the server # $1: The ID of the server
SERVER_LOG_roll() { server_log_roll() {
# Moves and Gzips the logfile, a big log file slows down the # Moves and Gzips the logfile, a big log file slows down the
# server A LOT (what was notch thinking?) # server A LOT (what was notch thinking?)
@ -1479,8 +1479,8 @@ command_server_worlds_off() {
# Moves an individual server's log text to another file, leaving it empty # Moves an individual server's log text to another file, leaving it empty
# $1: The server ID # $1: The server ID
command_SERVER_LOGroll() { command_server_logroll() {
SERVER_LOG_roll "$1" server_log_roll "$1"
} }
# Makes a backup of an entire server directory # Makes a backup of an entire server directory