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

Fixes #49. Active file is now created when starting a server.

Browse Source
This commit is contained in:
Marcus Whybrow 2012-07-15 17:23:38 +01:00
parent 3760a18053
commit b05d3a3db0
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

@ -496,11 +496,11 @@ server_wait_for_stop() {
server_set_active() {
case "$2" in
active)
as_user "${SERVER_USERNAME[$1]}" "touch \"${SERVER_FLAG_ACTIVE[$1]}\""
as_user "${SERVER_USERNAME[$1]}" "touch \"${SERVER_FLAG_ACTIVE_PATH[$1]}\""
SERVER_ACTIVE[$1]="true"
;;
inactive)
as_user "${SERVER_USERNAME[$1]}" "rm -f \"${SERVER_FLAG_ACTIVE[$1]}\""
as_user "${SERVER_USERNAME[$1]}" "rm -f \"${SERVER_FLAG_ACTIVE_PATH[$1]}\""
SERVER_ACTIVE[$1]="false"
;;
*)
@ -2137,17 +2137,11 @@ server_load_properties() {
# $1: The id to use for this server
# $2: The name of the server
server_init() {
# Non-configurable Variables
SERVER_NAME[$1]="$2"
SERVER_PATH[$1]="$SETTINGS_SERVER_STORAGE_PATH/$2"
SERVER_BACKUP_PATH[$1]="$SETTINGS_BACKUP_ARCHIVE_PATH/${SERVER_NAME[$1]}"
SERVER_LOG_ARCHIVE_PATH[$1]="$SETTINGS_LOG_ARCHIVE_PATH/${SERVER_NAME[$1]}"
if [[ -e "${SERVER_FLAG_ACTIVE[$1]}" ]]; then
SERVER_ACTIVE[$1]="true"
else
SERVER_ACTIVE[$1]="false"
fi
# Setup default values for this server's variables using default settings
@ -2169,6 +2163,12 @@ server_init() {
eval SERVER_${name}[$1]=\"${value}\"
done
if [[ -e "${SERVER_FLAG_ACTIVE_PATH[$1]}" ]]; then
SERVER_ACTIVE[$1]="true"
else
SERVER_ACTIVE[$1]="false"
fi
# Load setting overrides from server.properties
server_load_properties "$1"