Log errors when saving/replacing assets

resolves #2814
craftcms · Apr 26, 2018 · 68251ad · 68251ad
1 parent 27eaf6e
commit 68251ad
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 24 deletions.
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
@@ -5,6 +5,7 @@
 ### Changed
 - Fields’ translation icons now reveal the chosen Translation Method in their tooltip. ([#2808](https://github.com/craftcms/cms/issues/2808))
 - Improved the error messages displayed when an Assets field has an invalid Upload Location setting. ([#2803](https://github.com/craftcms/cms/issues/2803))
+- Craft now logs errors that occur when saving and replacing assets. ([#2814](https://github.com/craftcms/cms/issues/2814))
 
 ### Fixed
 - Fixed an error that would occur on servers without the Phar PHP extension enabled.

diff --git a/src/controllers/AssetsController.php b/src/controllers/AssetsController.php
@@ -142,8 +142,10 @@ public function actionSaveAsset(): Response
                 'filename' => $asset->filename,
                 'assetId' => $asset->id
             ]);
-        } catch (\Throwable $exception) {
-            return $this->asErrorJson($exception->getMessage());
+        } catch (\Throwable $e) {
+            Craft::error('An error occurred when saving an asset: '.$e->getMessage(), __METHOD__);
+            Craft::$app->getErrorHandler()->logException($e);
+            return $this->asErrorJson($e->getMessage());
         }
     }
 
@@ -229,8 +231,10 @@ public function actionReplaceFile(): Response
                     $assetId = $sourceAsset->id;
                 }
             }
-        } catch (\Throwable $exception) {
-            return $this->asErrorJson($exception->getMessage());
+        } catch (\Throwable $e) {
+            Craft::error('An error occurred when replacing an asset: '.$e->getMessage(), __METHOD__);
+            Craft::$app->getErrorHandler()->logException($e);
+            return $this->asErrorJson($e->getMessage());
         }
 
         return $this->asJson(['success' => true, 'assetId' => $assetId]);
@@ -1006,7 +1010,7 @@ private function _getUploadedFileTempPath(UploadedFile $uploadedFile)
         try {
             $tempPath = $uploadedFile->saveAsTempFile();
         } catch (ErrorException $e) {
-            throw new UploadFailedException(0);
+            throw new UploadFailedException(0, null, $e);
         }
 
         if ($tempPath === false) {

diff --git a/src/errors/UploadFailedException.php b/src/errors/UploadFailedException.php
@@ -17,33 +17,44 @@
  */
 class UploadFailedException extends FileException
 {
+    /**
+     * @var int Error code
+     */
+    public $errorCode;
+
     /**
      * Constructor
      *
      * @param int $errorCode
+     * @param string|null $message
+     * @param \Throwable|null $previous
      */
-    public function __construct(int $errorCode)
+    public function __construct(int $errorCode = 0, string $message = null, \Throwable $previous = null)
     {
-        switch ($errorCode) {
-            case UPLOAD_ERR_INI_SIZE:
-            case UPLOAD_ERR_FORM_SIZE:
-                $message = Craft::t('app', 'The uploaded file exceeds the maximum allowed size.');
-                break;
-            case UPLOAD_ERR_PARTIAL:
-            case UPLOAD_ERR_NO_FILE:
-                $message = Craft::t('app', 'The file failed to upload to the server properly.');
-                break;
-            case UPLOAD_ERR_NO_TMP_DIR:
-                $message = Craft::t('app', 'Could not write to the temporary upload folder.');
-                break;
-            case UPLOAD_ERR_CANT_WRITE:
-                $message = Craft::t('app', 'There was a problem with writing the file to the disk.');
-                break;
-            default:
-                $message = Craft::t('app', 'There was a problem with uploading the file.');
+        $this->errorCode = $errorCode;
+
+        if ($message === null) {
+            switch ($errorCode) {
+                case UPLOAD_ERR_INI_SIZE:
+                case UPLOAD_ERR_FORM_SIZE:
+                    $message = Craft::t('app', 'The uploaded file exceeds the maximum allowed size.');
+                    break;
+                case UPLOAD_ERR_PARTIAL:
+                case UPLOAD_ERR_NO_FILE:
+                    $message = Craft::t('app', 'The file failed to upload to the server properly.');
+                    break;
+                case UPLOAD_ERR_NO_TMP_DIR:
+                    $message = Craft::t('app', 'Could not write to the temporary upload folder.');
+                    break;
+                case UPLOAD_ERR_CANT_WRITE:
+                    $message = Craft::t('app', 'There was a problem with writing the file to the disk.');
+                    break;
+                default:
+                    $message = Craft::t('app', 'There was a problem with uploading the file.');
+            }
         }
 
-        parent::__construct($message);
+        parent::__construct($message, 0, $previous);
     }
 
     /**