summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelog.d/gun-logs-debug.skip0
-rw-r--r--changelog.d/oban-user-refresh-unique.fix1
-rw-r--r--lib/pleroma/telemetry/logger.ex4
-rw-r--r--lib/pleroma/workers/user_refresh_worker.ex4
4 files changed, 5 insertions, 4 deletions
diff --git a/changelog.d/gun-logs-debug.skip b/changelog.d/gun-logs-debug.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/gun-logs-debug.skip
diff --git a/changelog.d/oban-user-refresh-unique.fix b/changelog.d/oban-user-refresh-unique.fix
new file mode 100644
index 000000000..5e112c87f
--- /dev/null
+++ b/changelog.d/oban-user-refresh-unique.fix
@@ -0,0 +1 @@
+Oban Jobs for refreshing users were not respecting the uniqueness setting
diff --git a/lib/pleroma/telemetry/logger.ex b/lib/pleroma/telemetry/logger.ex
index 9998d8185..31ce3cc20 100644
--- a/lib/pleroma/telemetry/logger.ex
+++ b/lib/pleroma/telemetry/logger.ex
@@ -39,7 +39,7 @@ defmodule Pleroma.Telemetry.Logger do
_,
_
) do
- Logger.error(fn ->
+ Logger.debug(fn ->
"Connection pool failed to reclaim any connections due to all of them being in use. It will have to drop requests for opening connections to new hosts"
end)
end
@@ -70,7 +70,7 @@ defmodule Pleroma.Telemetry.Logger do
%{key: key},
_
) do
- Logger.warning(fn ->
+ Logger.debug(fn ->
"Pool worker for #{key}: Client #{inspect(client_pid)} died before releasing the connection with #{inspect(reason)}"
end)
end
diff --git a/lib/pleroma/workers/user_refresh_worker.ex b/lib/pleroma/workers/user_refresh_worker.ex
index 5842143f8..f43170c8f 100644
--- a/lib/pleroma/workers/user_refresh_worker.ex
+++ b/lib/pleroma/workers/user_refresh_worker.ex
@@ -3,11 +3,11 @@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Workers.UserRefreshWorker do
- use Pleroma.Workers.WorkerHelper, queue: "background", max_attempts: 1, unique: [period: 300]
+ use Oban.Worker, queue: :background, max_attempts: 1, unique: [period: 300]
alias Pleroma.User
- @impl Oban.Worker
+ @impl true
def perform(%Job{args: %{"ap_id" => ap_id}}) do
User.fetch_by_ap_id(ap_id)
end