diff options
| author | lain <lain@soykaf.club> | 2019-08-24 17:22:26 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-08-24 17:22:26 +0200 |
| commit | 1692fa89458f0f83f69ffa2f85a998869b8fe454 (patch) | |
| tree | 2d55897d351f538d52170d88c2de89adb202086e | |
| parent | cc6c0b4ba6762e6a9b0a90c3dcda3f95283eb22a (diff) | |
| download | pleroma-1692fa89458f0f83f69ffa2f85a998869b8fe454.tar.gz | |
ActivityExpirationWorker: Fix merge issues.
| -rw-r--r-- | lib/pleroma/activity_expiration_worker.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/application.ex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/activity_expiration_worker.ex b/lib/pleroma/activity_expiration_worker.ex index a341f58df..0f9e715f8 100644 --- a/lib/pleroma/activity_expiration_worker.ex +++ b/lib/pleroma/activity_expiration_worker.ex @@ -15,7 +15,7 @@ defmodule Pleroma.ActivityExpirationWorker do @schedule_interval :timer.minutes(1) - def start_link do + def start_link(_) do GenServer.start_link(__MODULE__, nil) end diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index 1e4de272c..483ac1f39 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -36,7 +36,7 @@ defmodule Pleroma.Application do Pleroma.Captcha, Pleroma.FlakeId, Pleroma.ScheduledActivityWorker, - Pleroma.ActiviyExpirationWorker + Pleroma.ActivityExpirationWorker ] ++ cachex_children() ++ hackney_pool_children() ++ |