Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: tmux uniqueness #4296

Merged
merged 20 commits into from
Aug 28, 2023
Merged

feat: tmux uniqueness #4296

merged 20 commits into from
Aug 28, 2023

Commits on Jul 28, 2023

  1. refactor: refactor tmux session handling

    - Updated the code to use the variable `socketname` instead of `sessionname` when interacting with tmux sessions.
    - Added logic to create a unique socket name using a UID if it doesn't already exist.
    - Refactored multiple functions (`fn_start_jk2`, `fn_start_tmux`, `fn_stop_graceful_ctrlc`, `fn_stop_graceful_cmd`, `fn_stop_graceful_goldsrc`, `fn_stop_graceful_avorion`, and `fn_stop_tmux`) to use the new socket name for tmux commands.
    
    This commit improves the readability and maintainability of the code by separating the concept of session names from socket names, allowing for more flexibility in managing tmux sessions.
    dgibbs64 committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    9c3ac62 View commit details
    Browse the repository at this point in the history
  2. feat: stop server when generating uid

    this should prevent issues when migrating to using uid
    dgibbs64 committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    c0bd66d View commit details
    Browse the repository at this point in the history
  3. refactor: lockfile handling

    - Removed unnecessary function fn_start_jk2()
    - Removed unused variable startparameters in fn_start_tmux()
    - Added comments to clarify code functionality
    - Renamed lockfile from "${lockdir}/${selfname}.lock" to "${lockdir}/${selfname}-start.lock"
    - Updated log messages and log file names to include timestamp
    dgibbs64 committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    0e8e1a3 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2023

  1. refactor: improve backup and update monitoring

    The code in `command_monitor.sh` has been refactored to enhance the monitoring of backups and updates. The conditions for checking if a backup or update is running have been modified to include additional checks using `pgrep`. This change improves the accuracy of the monitoring process.
    dgibbs64 committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    e871833 View commit details
    Browse the repository at this point in the history
  2. refactor: improve logging in core_exit.sh

    - Changed the grep command to include the -a flag to handle non-text files
    - Updated sed command to remove "modulefile=" from the output and redirect it to dev-debug-module-order.log
    dgibbs64 committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    2cbfb5f View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2023

  1. refactor: improve code readability and remove redundant code

    - Refactored the `fn_monitor_check_starting` function to check for stale lockfiles and print appropriate messages.
    - Refactored the `fn_monitor_check_stopping` function to check for stale lockfiles and print appropriate messages.
    - Removed redundant code that deletes the update lockfile in `command_update.sh` and `command_validate.sh`.
    - Improved code readability by removing unnecessary comments.
    dgibbs64 committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    46d73f0 View commit details
    Browse the repository at this point in the history
  2. feat: add exitbypass flag to prevent lingering tmux sessions

    The code changes in `command_start.sh` include adding an `exitbypass` flag to prevent lingering tmux sessions. This flag is used to stop the running server before creating a unique uid for the tmux socket name.
    dgibbs64 committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    3d6c92b View commit details
    Browse the repository at this point in the history
  3. refactor: Refactor lockfile names for consistency and clarity

    - Renamed "${lockdir}/${selfname}-laststart.lock" to "${lockdir}/${selfname}-last-started.lock"
    - Renamed "${lockdir}/backup.lock" to "${lockdir}/stopping.lock"
    - Renamed "${lockdir}/${selfname}-start.lock" to "${lockdir}/${selfname}-started.lock"
    - Renamed "${lockdir}/${selfname}-starting.lock" to "${lockdir}/${selfname}-stopping.lock"
    
    This commit refactors the lockfile names in the codebase for better consistency and clarity. The changes make it easier to understand the purpose of each lockfile and improve readability.
    dgibbs64 committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    d5a5639 View commit details
    Browse the repository at this point in the history
  4. refactor: refactor check_last_update.sh, command_backup.sh, command_d…

    …ebug.sh, command_mods_remove.sh, command_monitor.sh, command_start.sh, command_stop.sh, command_ts3_server_pass.sh and core_steamcmd.sh
    
    - Refactored code to improve readability and maintainability.
    - Renamed variables for clarity.
    - Removed unnecessary comments and unused code.
    - Fixed typos and formatting issues.
    dgibbs64 committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    b4c6a2a View commit details
    Browse the repository at this point in the history
  5. refactor: update lock file path in core_steamcmd.sh

    The lock file path in the core_steamcmd.sh script has been updated to use the correct variable. This change ensures that the lock file is created in the correct directory.
    dgibbs64 committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    0c716de View commit details
    Browse the repository at this point in the history
  6. refactor: improve file deletion in command_stop.sh

    The code change refactors the file deletion process in the command_stop.sh script. Instead of using an empty redirect, it now directly removes the specified lock file. This improves clarity and ensures proper cleanup when stopping a command.
    dgibbs64 committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    b7d9e1b View commit details
    Browse the repository at this point in the history
  7. refactor: update lockfile name in command_monitor.sh

    The lockfile name has been changed from "${selfname}-started.lock" to "${selfname}-monitoring.lock" in the fn_monitor_check_lockfile function. The code has also been refactored to remove unnecessary checks and fixes for the lockfile.
    dgibbs64 committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    d09c4f5 View commit details
    Browse the repository at this point in the history
  8. refactor: simplify start and stop command checks

    The code in `command_start.sh` and `command_stop.sh` has been refactored to simplify the checks for the start and stop commands. Instead of checking if `exitbypass` is empty, it now directly checks if `firstcommandname` matches specific values ("START", "RESTART" for start command, and "STOP" for stop command). This change improves readability and reduces unnecessary conditions.
    dgibbs64 committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    ac7e8fe View commit details
    Browse the repository at this point in the history
  9. refactor: simplify lockfile names and remove duplicate code

    - Renamed lockfiles from "${selfname}-started.lock" to "started.lock", "${selfname}-starting.lock" to "starting.lock", "${selfname}-stopping.lock" to "stopping.lock", and "${selfname}-update.lock" to "update.lock".
    - Removed duplicate code for removing stale lockfiles in fn_monitor_check_starting(), fn_monitor_check_stopping(), fn_monitor_check_backup(), fn_monitor_check_update(), update_factorio.sh, update_jediknight2.sh, update_minecraft.sh, update_minecraft_bedrock.sh, update_mta.sh, update_papermc.sh, update_ts3.sh, update_ut99.sh, and update_vintagestory.sh.
    - Updated references to the renamed lockfiles in the respective functions.
    dgibbs64 committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    43299f7 View commit details
    Browse the repository at this point in the history
  10. fix: corrected commandname

    dgibbs64 committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    0c0884c View commit details
    Browse the repository at this point in the history
  11. fix: commandname skeleton

    dgibbs64 committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    80760cf View commit details
    Browse the repository at this point in the history
  12. refactor: improve file path handling in check_last_update.sh

    The code changes refactor the file path handling in check_last_update.sh to use the correct lock directory. This ensures that the last update time is correctly retrieved and compared with the last start time.
    dgibbs64 committed Jul 30, 2023
    Configuration menu
    Copy the full SHA
    ae6d811 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. feat: add update lock file

    Add functionality to create an update lock file when validating and updating SteamCMD. This prevents potential conflicts with customised files.
    
    - Create a lock file with the current timestamp in the "command_validate.sh" script
    - Create a lock file with the current timestamp in the "update_steamcmd.sh" script
    dgibbs64 committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    e4571d5 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2023

  1. refactor: rename libgcc_s.so.1 backup file

    The code has been refactored to improve clarity and readability. The variable `libgccc_so` has been renamed to `libgccc_so.bak` for better understanding of its purpose. This change ensures that the backup file for libgcc_s.so.1 is correctly named and easily identifiable.
    dgibbs64 committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    88ad10f View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. refactor: improve logging and error handling in command_monitor.sh

    - Added error handling for PIDs with identical tmux sessions running, killing them and restarting the server.
    - Added error handling for PIDs with the same tmux session and socket names running, killing them and restarting the server.
    dgibbs64 committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    fda6a33 View commit details
    Browse the repository at this point in the history