diff --git a/root/app/www/public/crons/health.php b/root/app/www/public/crons/health.php index 02362bc..baa0b5a 100644 --- a/root/app/www/public/crons/health.php +++ b/root/app/www/public/crons/health.php @@ -12,17 +12,21 @@ logger(SYSTEM_LOG, 'Cron: running health'); logger(CRON_HEALTH_LOG, 'run ->'); -echo 'Cron run started: health' . "\n"; +echo date('c') . ' Cron: health ->' . "\n"; if ($settingsFile['tasks']['health']['disabled']) { - logger(CRON_HEALTH_LOG, 'Cron run stopped: disabled in tasks menu'); - echo date('c') . ' Cron run cancelled: disabled in tasks menu' . "\n"; + logger(CRON_HEALTH_LOG, 'Cron cancelled: disabled in tasks menu'); + logger(CRON_HEALTH_LOG, 'run <-'); + echo date('c') . ' Cron: health cancelled, disabled in tasks menu' . "\n"; + echo date('c') . ' Cron: health <-' . "\n"; exit(); } if (!$settingsFile['global']['restartUnhealthy'] && !$settingsFile['notifications']['triggers']['health']['active']) { - logger(CRON_HEALTH_LOG, 'Cron run stopped: restart and notify disabled'); - echo date('c') . ' Cron run stopped: restart and notify disabled' . "\n"; + logger(CRON_HEALTH_LOG, 'Cron cancelled: restart and notify disabled'); + logger(CRON_HEALTH_LOG, 'run <-'); + echo date('c') . ' Cron health cancelled: restart unhealthy and notify disabled' . "\n"; + echo date('c') . ' Cron: health <-' . "\n"; exit(); } @@ -135,4 +139,5 @@ setFile(APP_DATA_PATH . 'health.json', []); } -logger(CRON_HEALTH_LOG, 'run <-'); +echo date('c') . ' Cron: health <-' . "\n"; +logger(CRON_HEALTH_LOG, 'run <-'); \ No newline at end of file diff --git a/root/app/www/public/crons/housekeeper.php b/root/app/www/public/crons/housekeeper.php index fb0f454..2720c56 100644 --- a/root/app/www/public/crons/housekeeper.php +++ b/root/app/www/public/crons/housekeeper.php @@ -12,11 +12,13 @@ logger(SYSTEM_LOG, 'Cron: running housekeeper'); logger(CRON_HOUSEKEEPER_LOG, 'run ->'); -echo date('c') . ' Cron run started: housekeeper' . "\n"; +echo date('c') . ' Cron: housekeeper ->' . "\n"; if ($settingsFile['tasks']['housekeeping']['disabled']) { - logger(CRON_HOUSEKEEPER_LOG, 'Cron run stopped: disabled in tasks menu'); - echo date('c') . ' Cron run cancelled: disabled in tasks menu' . "\n"; + logger(CRON_HOUSEKEEPER_LOG, 'Cron cancelled: disabled in tasks menu'); + logger(CRON_HOUSEKEEPER_LOG, 'run <-'); + echo date('c') . ' Cron: housekeeper cancelled, disabled in tasks menu' . "\n"; + echo date('c') . ' Cron: housekeeper <-' . "\n"; exit(); } @@ -129,4 +131,5 @@ } } -logger(CRON_HOUSEKEEPER_LOG, 'run <-'); +echo date('c') . ' Cron: housekeeper <-' . "\n"; +logger(CRON_HOUSEKEEPER_LOG, 'run <-'); \ No newline at end of file diff --git a/root/app/www/public/crons/prune.php b/root/app/www/public/crons/prune.php index f57596e..70c2113 100644 --- a/root/app/www/public/crons/prune.php +++ b/root/app/www/public/crons/prune.php @@ -14,11 +14,13 @@ logger(SYSTEM_LOG, 'Cron: running prune'); logger(CRON_PRUNE_LOG, 'run ->'); -echo date('c') . ' Cron run started: prune' . "\n"; +echo date('c') . ' Cron: prune ->' . "\n"; if ($settingsFile['tasks']['prune']['disabled']) { - logger(CRON_PRUNE_LOG, 'Cron run stopped: disabled in tasks menu'); - echo date('c') . ' Cron run cancelled: disabled in tasks menu' . "\n"; + logger(CRON_PRUNE_LOG, 'Cron cancelled: disabled in tasks menu'); + logger(CRON_PRUNE_LOG, 'run <-'); + echo date('c') . ' Cron: prune cancelled, disabled in tasks menu' . "\n"; + echo date('c') . ' Cron: prune <-' . "\n"; exit(); } @@ -93,4 +95,5 @@ $notifications->notify($settingsFile['notifications']['triggers']['prune']['platform'], $payload); } -logger(CRON_PRUNE_LOG, 'run <-'); +echo date('c') . ' Cron: prune <-' . "\n"; +logger(CRON_PRUNE_LOG, 'run <-'); \ No newline at end of file diff --git a/root/app/www/public/crons/pulls.php b/root/app/www/public/crons/pulls.php index fbadd10..4cbd50d 100644 --- a/root/app/www/public/crons/pulls.php +++ b/root/app/www/public/crons/pulls.php @@ -14,11 +14,13 @@ logger(SYSTEM_LOG, 'Cron: running pulls'); logger(CRON_PULLS_LOG, 'run ->'); -echo date('c') . ' Cron run started: pulls' . "\n"; +echo date('c') . ' Cron: pulls' . "\n"; if ($settingsFile['tasks']['pulls']['disabled']) { - logger(CRON_PULLS_LOG, 'Cron run stopped: disabled in tasks menu'); - echo date('c') . ' Cron run cancelled: disabled in tasks menu' . "\n"; + logger(CRON_PULLS_LOG, 'Cron cancelled: disabled in tasks menu'); + logger(CRON_PULLS_LOG, 'run <-'); + echo date('c') . ' Cron: pulls cancelled, disabled in tasks menu' . "\n"; + echo date('c') . ' Cron: pulls <-' . "\n"; exit(); } @@ -352,4 +354,6 @@ } } + +echo date('c') . ' Cron: pulls <-' . "\n"; logger(CRON_PULLS_LOG, 'run <-'); \ No newline at end of file diff --git a/root/app/www/public/crons/sse.php b/root/app/www/public/crons/sse.php index 046a290..f4423e8 100644 --- a/root/app/www/public/crons/sse.php +++ b/root/app/www/public/crons/sse.php @@ -12,12 +12,13 @@ logger(SYSTEM_LOG, 'Cron: running sse'); logger(CRON_SSE_LOG, 'run ->'); -echo date('c') . ' Cron run started: sse' . "\n"; +echo date('c') . ' Cron: sse' . "\n"; if (!$settingsFile['global']['sseEnabled']) { - logger(CRON_SSE_LOG, 'Cron run stopped: disabled in tasks menu'); + logger(CRON_SSE_LOG, 'Cron cancelled: disabled in tasks menu'); logger(CRON_SSE_LOG, 'run <-'); - echo date('c') . ' Cron run cancelled: disabled in tasks menu' . "\n"; + echo date('c') . ' Cron: sse cancelled, disabled in tasks menu' . "\n"; + echo date('c') . ' Cron: sse <-' . "\n"; exit(); } @@ -34,4 +35,5 @@ setFile(SSE_FILE, $updatedProcessList); +echo date('c') . ' Cron: sse <-' . "\n"; logger(CRON_SSE_LOG, 'run <-'); \ No newline at end of file diff --git a/root/app/www/public/crons/state.php b/root/app/www/public/crons/state.php index 9c2ddea..b72a4b3 100644 --- a/root/app/www/public/crons/state.php +++ b/root/app/www/public/crons/state.php @@ -12,11 +12,13 @@ logger(SYSTEM_LOG, 'Cron: running state'); logger(CRON_STATE_LOG, 'run ->'); -echo date('c') . ' Cron run started: state' . "\n"; +echo date('c') . ' Cron: state' . "\n"; if ($settingsFile['tasks']['state']['disabled']) { - logger(CRON_STATE_LOG, 'Cron run stopped: disabled in tasks menu'); - echo date('c') . ' Cron run cancelled: disabled in tasks menu' . "\n"; + logger(CRON_STATE_LOG, 'Cron cancelled: disabled in tasks menu'); + logger(CRON_STATE_LOG, 'run <-'); + echo date('c') . ' Cron: state cancelled, disabled in tasks menu' . "\n"; + echo date('c') . ' Cron: state <-' . "\n"; exit(); } @@ -198,4 +200,5 @@ } } +echo date('c') . ' Cron: state <-' . "\n"; logger(CRON_STATE_LOG, 'run <-'); \ No newline at end of file diff --git a/root/app/www/public/crons/stats.php b/root/app/www/public/crons/stats.php index 6b35e09..77e0efb 100644 --- a/root/app/www/public/crons/stats.php +++ b/root/app/www/public/crons/stats.php @@ -12,15 +12,18 @@ logger(SYSTEM_LOG, 'Cron: running stats'); logger(CRON_STATS_LOG, 'run ->'); -echo date('c') . ' Cron run started: stats' . "\n"; +echo date('c') . ' Cron: stats' . "\n"; if ($settingsFile['tasks']['stats']['disabled']) { - logger(CRON_STATS_LOG, 'Cron run stopped: disabled in tasks menu'); - echo date('c') . ' Cron run cancelled: disabled in tasks menu' . "\n"; + logger(CRON_STATS_LOG, 'Cron cancelled: disabled in tasks menu'); + logger(CRON_STATS_LOG, 'run <-'); + echo date('c') . ' Cron: stats cancelled, disabled in tasks menu' . "\n"; + echo date('c') . ' Cron: stats <-' . "\n"; exit(); } $dockerStats = $docker->stats(false); setServerFile('stats', $dockerStats); -logger(CRON_STATS_LOG, 'run <-'); +echo date('c') . ' Cron: stats <-' . "\n"; +logger(CRON_STATS_LOG, 'run <-'); \ No newline at end of file