diff --git a/CHANGELOG.md b/CHANGELOG.md index f434955c..2bc197ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,6 +50,7 @@ - Update delete pipelines, properly invoke StatusHashtag delete events ([ce54d29c](https://github.com/pixelfed/pixelfed/commit/ce54d29c)) - Update mail config ([0e431271](https://github.com/pixelfed/pixelfed/commit/0e431271)) - Update hashtag following ([015b1b80](https://github.com/pixelfed/pixelfed/commit/015b1b80)) +- Update IncrementPostCount job, prevent overlap ([b2c9cc23](https://github.com/pixelfed/pixelfed/commit/b2c9cc23)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.9 (2023-08-21)](https://github.com/pixelfed/pixelfed/compare/v0.11.8...v0.11.9) diff --git a/app/Jobs/HomeFeedPipeline/FeedInsertPipeline.php b/app/Jobs/HomeFeedPipeline/FeedInsertPipeline.php index f0455c63..bf9c849a 100644 --- a/app/Jobs/HomeFeedPipeline/FeedInsertPipeline.php +++ b/app/Jobs/HomeFeedPipeline/FeedInsertPipeline.php @@ -66,6 +66,7 @@ class FeedInsertPipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing { $ids = FollowerService::localFollowerIds($this->pid); + HomeTimelineService::add($this->pid, $this->sid); foreach($ids as $id) { HomeTimelineService::add($id, $this->sid); } diff --git a/app/Jobs/ProfilePipeline/IncrementPostCount.php b/app/Jobs/ProfilePipeline/IncrementPostCount.php index fe8d9064..1a94f1e6 100644 --- a/app/Jobs/ProfilePipeline/IncrementPostCount.php +++ b/app/Jobs/ProfilePipeline/IncrementPostCount.php @@ -8,16 +8,48 @@ use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; +use Illuminate\Queue\Middleware\WithoutOverlapping; +use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing; use App\Profile; use App\Status; use App\Services\AccountService; -class IncrementPostCount implements ShouldQueue +class IncrementPostCount implements ShouldQueue, ShouldBeUniqueUntilProcessing { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; public $id; + public $timeout = 900; + public $tries = 3; + public $maxExceptions = 1; + public $failOnTimeout = true; + + /** + * The number of seconds after which the job's unique lock will be released. + * + * @var int + */ + public $uniqueFor = 3600; + + /** + * Get the unique ID for the job. + */ + public function uniqueId(): string + { + return 'propipe:ipc:' . $this->id; + } + + /** + * Get the middleware the job should pass through. + * + * @return array + */ + public function middleware(): array + { + return [(new WithoutOverlapping("propipe:ipc:{$this->id}"))->shared()->dontRelease()]; + } + /** * Create a new job instance. * @@ -47,6 +79,7 @@ class IncrementPostCount implements ShouldQueue $profile->last_status_at = now(); $profile->save(); AccountService::del($id); + AccountService::get($id); return 1; }