Merge pull request #6451 from pixelfed/a1

bugfix: Video/ImageThumbnail marks media as processed even when thumbnail generation fails

app/Jobs/ImageOptimizePipeline/ImageThumbnail.php

@@ -69,6 +69,8 @@ class ImageThumbnail implements ShouldQueue
             if (config('app.dev_log')) {
                 Log::error('Thumbnail generation failed: '.$e->getMessage());
             }
+
+            return;
         }
 
         $media->processed_at = Carbon::now();

app/Jobs/VideoPipeline/VideoThumbnail.php

@@ -9,6 +9,7 @@ use App\Services\StatusService;
 use App\Util\Media\Blurhash;
 use Cache;
 use FFMpeg;
+use Log;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -107,7 +108,11 @@ class VideoThumbnail implements ShouldBeUniqueUntilProcessing, ShouldQueue
                 VideoHlsPipeline::dispatch($media)->onQueue('mmo');
             }
         } catch (\Exception $e) {
+            if (config('app.dev_log')) {
+                Log::error('Video thumbnail generation failed: '.$e->getMessage());
+            }
 
+            throw $e;
         }
 
         if ($media->status_id) {

app/Util/Media/Image.php

@@ -292,8 +292,6 @@ class Image
             }
 
         } catch (\Exception $e) {
-            $media->processed_at = now();
-            $media->save();
             if (config('app.dev_log')) {
                 Log::info('MediaResizeException: '.$e->getMessage().' | Could not process media id: '.$media->id);
             }