From 77588317f9335a7bbc13c1f6755c5ae55e03ef4b Mon Sep 17 00:00:00 2001
From: Ludovic <54670129+lbr38@users.noreply.github.com>
Date: Wed, 8 Jan 2025 08:10:22 +0100
Subject: [PATCH] 4.15.2
---
www/controllers/Repo/Mirror/Mirror.php | 10 ++++-----
www/controllers/Service/ScheduledTask.php | 2 --
www/public/assets/favicon.ico | Bin 3821 -> 4604 bytes
www/version | 2 +-
.../containers/tasks/log/substep.inc.php | 20 +++++++-----------
5 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/www/controllers/Repo/Mirror/Mirror.php b/www/controllers/Repo/Mirror/Mirror.php
index c2e46a0e..3d5334c8 100644
--- a/www/controllers/Repo/Mirror/Mirror.php
+++ b/www/controllers/Repo/Mirror/Mirror.php
@@ -199,15 +199,15 @@ public function download(string $url, string $savePath, int $retries = 0)
*/
if ($currentRetry != $retries) {
$currentRetry++;
- $this->logWarning('Curl error (' . curl_errno($this->curlHandle) . '): ' . curl_error($this->curlHandle));
- $this->logNote('Retrying (' . $currentRetry . '/' . $retries . ') ...');
+ $this->taskLogSubStepController->output('Curl error (' . curl_errno($this->curlHandle) . '): ' . curl_error($this->curlHandle), 'warning');
+ $this->taskLogSubStepController->output('Retrying (' . $currentRetry . '/' . $retries . ') ...', 'note');
continue;
}
/**
* If curl has failed (meaning a curl param might be invalid or timeout has been reached)
*/
- $this->logError('Curl error (' . curl_errno($this->curlHandle) . '): ' . curl_error($this->curlHandle), 'Download error');
+ throw new Exception('Curl error (' . curl_errno($this->curlHandle) . '): ' . curl_error($this->curlHandle));
curl_close($this->curlHandle);
fclose($localFile);
@@ -223,9 +223,9 @@ public function download(string $url, string $savePath, int $retries = 0)
* If return code is 404
*/
if ($status["http_code"] == '404') {
- $this->logOutput('File not found (404)' . PHP_EOL);
+ $this->taskLogSubStepController->output('File not found (404)', 'error');
} else {
- $this->logOutput('File could not be downloaded (http return code is: ' . $status["http_code"] . ')' . PHP_EOL);
+ $this->taskLogSubStepController->output('File could not be downloaded (http return code is: ' . $status["http_code"] . ')', 'error');
}
curl_close($this->curlHandle);
diff --git a/www/controllers/Service/ScheduledTask.php b/www/controllers/Service/ScheduledTask.php
index ce10fb89..3bb9bcac 100644
--- a/www/controllers/Service/ScheduledTask.php
+++ b/www/controllers/Service/ScheduledTask.php
@@ -29,7 +29,6 @@ public function execute()
* Quit if there was an error while loading general settings
*/
if (defined('__LOAD_GENERAL_ERROR') and __LOAD_GENERAL_ERROR > 0) {
- // $this->logController->log('error', 'Service', 'Cannot execute scheduled task(s): some general settings are not defined.');
return;
}
@@ -173,7 +172,6 @@ public function sendReminders()
* Quit if there was an error while loading general settings
*/
if (defined('__LOAD_GENERAL_ERROR') and __LOAD_GENERAL_ERROR > 0) {
- // $this->logController->log('error', 'Service', 'Cannot execute scheduled task(s): some general settings are not defined.');
return;
}
diff --git a/www/public/assets/favicon.ico b/www/public/assets/favicon.ico
index b10b007f2ed104716de8143988c3127231be3a41..8d1d1185812ae1eeaebcd0dedc5efa37ed4f2d46 100644
GIT binary patch
literal 4604
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
GiTWQ8h&gls
literal 3821
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' . $message . '
';
- }
-
- if ($type == 'warning') {
- echo '' . $message . '
';
- }
-
- if ($type == 'error') {
+ if ($type == 'note') {
+ echo '' . $message . '
';
+ } else if ($type == 'warning') {
+ echo '' . $message . '
';
+ } else if ($type == 'error') {
echo '' . $message . '
';
- }
-
- if ($type == 'pre') {
+ } else if ($type == 'pre') {
echo '' . $message . '
';
+ } else {
+ echo '' . $message . '
';
}
}
}