mrleo1nid/PupaMLupa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enhance logging in install-service.sh for Minecraft server launch by adding a prefix for easier identification in logs, improving visibility of Java command and arguments, and ensuring consistent output formatting.

Browse Source
This commit is contained in:
Leonid Pershin
2026-05-09 15:16:05 +03:00
parent 2dc18d7953
commit 44a4aa656d
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/install-service.sh
+13 -11
View File
@@ -197,25 +197,27 @@ if [[ -s "./variables.txt" ]]; then
fi fi
GAME_ARGS_REL="${NEOFORGE_ARGS_REL}" GAME_ARGS_REL="${NEOFORGE_ARGS_REL}"
# Префикс для journalctl | grep, например: journalctl -u minecraft -b | grep '[mc-launch]'
_MC_LP='[mc-launch]'
echo "==== Minecraft server launch (systemd / run-service.sh) ====" echo "\${_MC_LP} ========== Minecraft server (systemd / run-service.sh) =========="
_JAVA_CMD="\${JAVA:-java}" _JAVA_CMD="\${JAVA:-java}"
if command -v "\$_JAVA_CMD" >/dev/null 2>&1; then if command -v "\$_JAVA_CMD" >/dev/null 2>&1; then
echo "Java: \$(command -v "\$_JAVA_CMD")" echo "\${_MC_LP} Java: \$(command -v "\$_JAVA_CMD")"
else else
echo "Java: \$_JAVA_CMD" echo "\${_MC_LP} Java: \$_JAVA_CMD"
fi fi
echo "ADDITIONAL_ARGS: \${ADDITIONAL_ARGS:-}" echo "\${_MC_LP} ADDITIONAL_ARGS: \${ADDITIONAL_ARGS:-}"
echo "JVM args (user_jvm_args.txt):" echo "\${_MC_LP} JVM args (user_jvm_args.txt):"
if [[ -f user_jvm_args.txt ]]; then if [[ -f user_jvm_args.txt ]]; then
grep -v '^[[:space:]]*#' user_jvm_args.txt | grep -v '^[[:space:]]*$' || true grep -v '^[[:space:]]*#' user_jvm_args.txt | grep -v '^[[:space:]]*$' | sed "s/^/\${_MC_LP} /" || true
else else
echo " (user_jvm_args.txt not found)" echo "\${_MC_LP} (user_jvm_args.txt not found)"
fi fi
echo "Game/program args file: @\${GAME_ARGS_REL}" echo "\${_MC_LP} Game/program args file: @\${GAME_ARGS_REL}"
echo "Trailing args: \$*" echo "\${_MC_LP} Trailing args: \$*"
echo "Java invocation pattern: \$_JAVA_CMD \${ADDITIONAL_ARGS:-} @user_jvm_args.txt @\${GAME_ARGS_REL} \$*" echo "\${_MC_LP} Java invocation pattern: \$_JAVA_CMD \${ADDITIONAL_ARGS:-} @user_jvm_args.txt @\${GAME_ARGS_REL} \$*"
echo "===========================================================" echo "\${_MC_LP} =============================================================="
# shellcheck disable=SC2086 # shellcheck disable=SC2086
exec "\${JAVA:-java}" \${ADDITIONAL_ARGS:-} @user_jvm_args.txt @"${NEOFORGE_ARGS_REL}" "\$@" exec "\${JAVA:-java}" \${ADDITIONAL_ARGS:-} @user_jvm_args.txt @"${NEOFORGE_ARGS_REL}" "\$@"