logs

joomla · Aug 22, 2023 · 2af0bec · 2af0bec
1 parent ec04fcf
commit 2af0bec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/administrator/components/com_joomlaupdate/src/Controller/UpdateController.php b/administrator/components/com_joomlaupdate/src/Controller/UpdateController.php
@@ -46,11 +46,7 @@ public function download()
         $model = $this->getModel('Update');
         $user  = $this->app->getIdentity();
 
-        try {
-            Log::add(Text::sprintf('COM_JOOMLAUPDATE_UPDATE_LOG_START', $user->id, $user->name, \JVERSION), Log::INFO, 'Update');
-        } catch (\RuntimeException $exception) {
-            // Informational log only
-        }
+        Log::add(Text::sprintf('COM_JOOMLAUPDATE_UPDATE_LOG_START', $user->id, $user->name, \JVERSION), Log::INFO, 'Update');
 
         $result = $model->download();
         $file   = $result['basename'];
@@ -80,11 +76,7 @@ public function download()
             $this->app->setUserState('com_joomlaupdate.file', $file);
             $url = 'index.php?option=com_joomlaupdate&task=update.install&' . $this->app->getSession()->getFormToken() . '=1';
 
-            try {
-                Log::add(Text::sprintf('COM_JOOMLAUPDATE_UPDATE_LOG_FILE', $file), Log::INFO, 'Update');
-            } catch (\RuntimeException $exception) {
-                // Informational log only
-            }
+            Log::add(Text::sprintf('COM_JOOMLAUPDATE_UPDATE_LOG_FILE', $file), Log::INFO, 'Update');
         } else {
             $this->app->setUserState('com_joomlaupdate.file', null);
             $url         = 'index.php?option=com_joomlaupdate';
@@ -110,11 +102,7 @@ public function install()
         /** @var \Joomla\Component\Joomlaupdate\Administrator\Model\UpdateModel $model */
         $model = $this->getModel('Update');
 
-        try {
-            Log::add(Text::_('COM_JOOMLAUPDATE_UPDATE_LOG_INSTALL'), Log::INFO, 'Update');
-        } catch (\RuntimeException $exception) {
-            // Informational log only
-        }
+        Log::add(Text::_('COM_JOOMLAUPDATE_UPDATE_LOG_INSTALL'), Log::INFO, 'Update');
 
         $file = $this->app->getUserState('com_joomlaupdate.file', null);
         $model->createRestorationFile($file);
@@ -263,6 +251,8 @@ public function upload()
         /** @var \Joomla\Component\Joomlaupdate\Administrator\Model\UpdateModel $model */
         $model = $this->getModel('Update');
 
+        Log::add(Text::_('COM_JOOMLAUPDATE_UPDATE_LOG_UPLOAD'), Log::INFO, 'Update');
+
         try {
             $model->upload();
         } catch (\RuntimeException $e) {

diff --git a/administrator/language/en-GB/com_joomlaupdate.ini b/administrator/language/en-GB/com_joomlaupdate.ini
@@ -75,6 +75,7 @@ COM_JOOMLAUPDATE_UPDATE_LOG_FILE="File %s downloaded."
 COM_JOOMLAUPDATE_UPDATE_LOG_FINALISE="Finalising installation."
 COM_JOOMLAUPDATE_UPDATE_LOG_INSTALL="Starting installation of new version."
 COM_JOOMLAUPDATE_UPDATE_LOG_START="Update started by user %2$s (%1$s). Old version is %3$s."
+COM_JOOMLAUPDATE_UPDATE_LOG_UPLOAD="Uploading update file"
 COM_JOOMLAUPDATE_UPDATE_LOG_URL="Downloading update file from %s."
 COM_JOOMLAUPDATE_UPDATING_HEAD="Update in progress"
 COM_JOOMLAUPDATE_UPDATING_INPROGRESS="Please wait; Joomla is being updated. This may take a while."