diff --git a/front/php/server/db.php b/front/php/server/db.php index 89d4d906..a543c592 100755 --- a/front/php/server/db.php +++ b/front/php/server/db.php @@ -28,6 +28,8 @@ if (!is_dir($dbFolderPath)) { @mkdir($dbFolderPath, 0775, true); } +$dbFolderPath = rtrim($dbFolderPath, '/') . '/'; + $DBFILE = rtrim($dbFolderPath, '/') . '/app.db'; if (!file_exists($DBFILE) && file_exists($legacyDbPath)) { $DBFILE = $legacyDbPath; @@ -41,6 +43,8 @@ if (!is_dir($logFolderPath)) { @mkdir($logFolderPath, 0775, true); } +$logFolderPath = rtrim($logFolderPath, '/') . '/'; + $DBFILE_LOCKED_FILE = rtrim($logFolderPath, '/') . '/db_is_locked.log'; diff --git a/install/production-filesystem/services/scripts/cron_script.sh b/install/production-filesystem/services/scripts/cron_script.sh index 347f1a20..2a0b4f42 100755 --- a/install/production-filesystem/services/scripts/cron_script.sh +++ b/install/production-filesystem/services/scripts/cron_script.sh @@ -1,16 +1,10 @@ #!/bin/bash -export INSTALL_DIR=/app +# If cron_restart_backend exists in the file LOG_EXECUTION_QUEUE, then +# call the restart backend script and remove the line from the file +# and remove the entry - -# Check if there are any entries with cron_restart_backend if grep -q "cron_restart_backend" "${LOG_EXECUTION_QUEUE}"; then - killall python3 - sleep 2 /services/start-backend.sh & - - # Remove all lines containing cron_restart_backend from the log file - # Atomic replacement with temp file - grep -v "cron_restart_backend" "${LOG_EXECUTION_QUEUE}" > "${LOG_EXECUTION_QUEUE}.tmp" && \ - mv "${LOG_EXECUTION_QUEUE}.tmp" "${LOG_EXECUTION_QUEUE}" + sed -i '/cron_restart_backend/d' "${LOG_EXECUTION_QUEUE}" fi diff --git a/install/production-filesystem/services/start-crond.sh b/install/production-filesystem/services/start-crond.sh index c6e9ea70..548c5d6a 100755 --- a/install/production-filesystem/services/start-crond.sh +++ b/install/production-filesystem/services/start-crond.sh @@ -23,9 +23,9 @@ done trap cleanup EXIT trap forward_signal INT TERM -echo "Starting /usr/sbin/crond -c \"${SYSTEM_SERVICES_CROND}\" -f -L \"${LOG_CROND}\" >>\"${LOG_CROND}\" 2>&1 &" +echo "Starting /usr/sbin/crond -c \"${SYSTEM_SERVICES_CROND}\" -f -l 1 -L \"${LOG_CROND}\" >>\"${LOG_CROND}\" 2>&1 &" -/usr/sbin/crond -c "${SYSTEM_SERVICES_CROND}" -f -L "${LOG_CROND}" >>"${LOG_CROND}" 2>&1 & +/usr/sbin/crond -c "${SYSTEM_SERVICES_CROND}" -f -l 1 -L "${LOG_CROND}" >>"${LOG_CROND}" 2>&1 & crond_pid=$! wait "${crond_pid}"; status=$?