Skip to content

Commit 0b38915

Browse files
committed
feat:add version and port details to lockfile
1 parent b7c8f9e commit 0b38915

File tree

7 files changed

+16
-2
lines changed

7 files changed

+16
-2
lines changed

lgsm/functions/command_debug.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ fn_print_ok_nl "Starting debug"
9595

9696
# Create lockfile.
9797
date '+%s' > "${lockdir}/${selfname}.lock"
98+
echo "${version}" >> "${lockdir}/${selfname}.lock"
99+
echo "${port}" >> "${lockdir}/${selfname}.lock"
98100
fn_script_log_info "Lockfile generated"
99101
fn_script_log_info "${lockdir}/${selfname}.lock"
100102

lgsm/functions/command_monitor.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ fn_monitor_check_lockfile(){
2525
fi
2626

2727
# Fix if lockfile is not unix time or contains letters
28-
if [ -f "${lockdir}/${selfname}.lock" ]&&[[ "$(cat "${lockdir}/${selfname}.lock")" =~ [A-Za-z] ]]; then
29-
date '+%s' > "${lockdir}/${selfname}.lock"
28+
if [ -f "${lockdir}/${selfname}.lock" ]&&[[ "$(head -n 1 "${lockdir}/${selfname}.lock")" =~ [A-Za-z] ]]; then
29+
date '+%s' > "${lockdir}/${selfname}.lock"
30+
echo "${version}" >> "${lockdir}/${selfname}.lock"
31+
echo "${port}" >> "${lockdir}/${selfname}.lock"
3032
fi
3133
}
3234

lgsm/functions/command_start.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ fn_start_tmux(){
7171

7272
# Create lockfile
7373
date '+%s' > "${lockdir}/${selfname}.lock"
74+
echo "${version}" >> "${lockdir}/${selfname}.lock"
75+
echo "${port}" >> "${lockdir}/${selfname}.lock"
7476
cd "${executabledir}" || exit
7577
tmux new-session -d -x "${sessionwidth}" -y "${sessionheight}" -s "${sessionname}" "${executable} ${parms}" 2> "${lgsmlogdir}/.${selfname}-tmux-error.tmp"
7678

tests/tests_fctrserver.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -938,6 +938,8 @@ requiredstatus="OFFLINE"
938938
fn_setstatus
939939
fn_print_info_nl "creating lockfile."
940940
date '+%s' > "${lockdir}/${selfname}.lock"
941+
echo "${version}" >> "${lockdir}/${selfname}.lock"
942+
echo "${port}" >> "${lockdir}/${selfname}.lock"
941943
(
942944
exec 5>"${TRAVIS_BUILD_DIR}/dev-debug.log"
943945
BASH_XTRACEFD="5"

tests/tests_jc2server.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,6 +1097,8 @@ requiredstatus="OFFLINE"
10971097
fn_setstatus
10981098
fn_print_info_nl "creating lockfile."
10991099
date '+%s' > "${lockdir}/${selfname}.lock"
1100+
echo "${version}" >> "${lockdir}/${selfname}.lock"
1101+
echo "${port}" >> "${lockdir}/${selfname}.lock"
11001102
(
11011103
exec 5>"${TRAVIS_BUILD_DIR}/dev-debug.log"
11021104
BASH_XTRACEFD="5"

tests/tests_mcserver.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -970,6 +970,8 @@ requiredstatus="OFFLINE"
970970
fn_setstatus
971971
fn_print_info_nl "creating lockfile."
972972
date '+%s' > "${lockdir}/${selfname}.lock"
973+
echo "${version}" >> "${lockdir}/${selfname}.lock"
974+
echo "${port}" >> "${lockdir}/${selfname}.lock"
973975
(
974976
exec 5>"${TRAVIS_BUILD_DIR}/dev-debug.log"
975977
BASH_XTRACEFD="5"

tests/tests_ts3server.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -937,6 +937,8 @@ requiredstatus="OFFLINE"
937937
fn_setstatus
938938
fn_print_info_nl "creating lockfile."
939939
date '+%s' > "${lockdir}/${selfname}.lock"
940+
echo "${version}" >> "${lockdir}/${selfname}.lock"
941+
echo "${port}" >> "${lockdir}/${selfname}.lock"
940942
(
941943
exec 5>"${TRAVIS_BUILD_DIR}/dev-debug.log"
942944
BASH_XTRACEFD="5"

0 commit comments

Comments
 (0)