Merge pull request #224 from lbr38/devel

4.15.2
lbr38 · Jan 8, 2025 · b4f3440 · b4f3440
2 parents 9cbedae + 7758831
commit b4f3440
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 20 deletions.
diff --git 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
@@ -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
diff --git a/www/version b/www/version
@@ -1 +1 @@
-4.15.1
+4.15.2
diff --git a/www/views/includes/containers/tasks/log/substep.inc.php b/www/views/includes/containers/tasks/log/substep.inc.php
@@ -37,20 +37,16 @@
                     $type = $outputDetails['type'];
                     $message = $outputDetails['message'];
 
-                    if ($type == 'info') {
-                        echo '<p>' . $message . '</p>';
-                    }
-
-                    if ($type == 'warning') {
-                        echo '<p>' . $message . '</p>';
-                    }
-
-                    if ($type == 'error') {
+                    if ($type == 'note') {
+                        echo '<p class="note">' . $message . '</p>';
+                    } else if ($type == 'warning') {
+                        echo '<p class="yellowtext">' . $message . '</p>';
+                    } else if ($type == 'error') {
                         echo '<p class="redtext">' . $message . '</p>';
-                    }
-
-                    if ($type == 'pre') {
+                    } else if ($type == 'pre') {
                         echo '<pre class="codeblock">' . $message . '</pre>';
+                    } else {
+                        echo '<p>' . $message . '</p>';
                     }
                 }
             }