瀏覽代碼

Update jobs, add retry and timeout attributes

Daniel Supernault 5 年之前
父節點
當前提交
6476855519

+ 3 - 0
app/Jobs/CommentPipeline/CommentPipeline.php

@@ -30,6 +30,9 @@ class CommentPipeline implements ShouldQueue
      * @var bool
      * @var bool
      */
      */
     public $deleteWhenMissingModels = true;
     public $deleteWhenMissingModels = true;
+
+    public $timeout = 5;
+    public $tries = 1;
     
     
     /**
     /**
      * Create a new job instance.
      * Create a new job instance.

+ 3 - 0
app/Jobs/LikePipeline/LikePipeline.php

@@ -28,6 +28,9 @@ class LikePipeline implements ShouldQueue
      */
      */
     public $deleteWhenMissingModels = true;
     public $deleteWhenMissingModels = true;
 
 
+    public $timeout = 5;
+    public $tries = 1;
+
     /**
     /**
      * Create a new job instance.
      * Create a new job instance.
      *
      *

+ 3 - 0
app/Jobs/StatusPipeline/NewStatusPipeline.php

@@ -23,6 +23,9 @@ class NewStatusPipeline implements ShouldQueue
      * @var bool
      * @var bool
      */
      */
     public $deleteWhenMissingModels = true;
     public $deleteWhenMissingModels = true;
+
+    public $timeout = 5;
+    public $tries = 1;
     
     
     /**
     /**
      * Create a new job instance.
      * Create a new job instance.

+ 8 - 1
app/Jobs/StatusPipeline/StatusEntityLexer.php

@@ -8,6 +8,7 @@ use App\Mention;
 use App\Profile;
 use App\Profile;
 use App\Status;
 use App\Status;
 use App\StatusHashtag;
 use App\StatusHashtag;
+use App\Services\PublicTimelineService;
 use App\Util\Lexer\Autolink;
 use App\Util\Lexer\Autolink;
 use App\Util\Lexer\Extractor;
 use App\Util\Lexer\Extractor;
 use DB;
 use DB;
@@ -136,7 +137,13 @@ class StatusEntityLexer implements ShouldQueue
 
 
     public function deliver()
     public function deliver()
     {
     {
-        if(config('federation.activitypub.enabled') == true) {
+        $status = $this->status;
+
+        if($status->uri == null && $status->scope == 'public') {
+            PublicTimelineService::add($status->id);
+        }
+
+        if(config('federation.activitypub.enabled') == true && config('app.env') == 'production') {
             StatusActivityPubDeliver::dispatch($this->status);
             StatusActivityPubDeliver::dispatch($this->status);
         }
         }
     }
     }