diff --git a/lib/flume/pipeline/system_event/worker.ex b/lib/flume/pipeline/system_event/worker.ex index eb34a3e..4b91c6f 100644 --- a/lib/flume/pipeline/system_event/worker.ex +++ b/lib/flume/pipeline/system_event/worker.ex @@ -20,33 +20,27 @@ defmodule Flume.Pipeline.SystemEvent.Worker do end def success(event) do - retry with: exp_backoff() |> randomize() |> expiry(@retry_expiry_timeout) do + retry with: exponential_backoff() |> randomize() |> expiry(@retry_expiry_timeout) do QueueManager.remove_processing(Config.namespace(), event.queue, event.original_json) - end - |> case do - {:error, _} -> - SystemEvent.Producer.enqueue({:success, event}) - - _ -> - nil + after + result -> result + else + _ -> SystemEvent.Producer.enqueue({:success, event}) end end def fail(event, error_message) do - retry with: exp_backoff() |> randomize() |> expiry(@retry_expiry_timeout) do + retry with: exponential_backoff() |> randomize() |> expiry(@retry_expiry_timeout) do QueueManager.retry_or_fail_job( Config.namespace(), event.queue, event.original_json, error_message ) - end - |> case do - {:error, _} -> - SystemEvent.Producer.enqueue({:failed, event, error_message}) - - _ -> - nil + after + result -> result + else + _ -> SystemEvent.Producer.enqueue({:failed, event, error_message}) end end end diff --git a/mix.lock b/mix.lock index 7d5420d..c93abf2 100644 --- a/mix.lock +++ b/mix.lock @@ -9,7 +9,7 @@ "hackney": {:hex, :hackney, "1.15.1", "9f8f471c844b8ce395f7b6d8398139e26ddca9ebc171a8b91342ee15a19963f4", [:rebar3], [{:certifi, "2.5.1", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "6.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.4", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm", "c2790c9f0f7205f4a362512192dee8179097394400e745e4d20bab7226a8eaad"}, "idna": {:hex, :idna, "6.0.0", "689c46cbcdf3524c44d5f3dde8001f364cd7608a99556d8fbd8239a5798d4c10", [:rebar3], [{:unicode_util_compat, "0.4.1", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "4bdd305eb64e18b0273864920695cb18d7a2021f31a11b9c5fbcd9a253f936e2"}, "jason": {:hex, :jason, "1.1.0", "9634bca30f2f7468dde3e704d5865319b1eb88e4a8cded5c995baf0aa957524f", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "23e9d96104cce9e74a63356f280ad7c7abc8ee68a45fb051d0845236bc94386c"}, - "logger_file_backend": {:hex, :logger_file_backend, "0.0.10", "876f9f84ae110781207c54321ffbb62bebe02946fe3c13f0d7c5f5d8ad4fa910", [:mix], [], "hexpm", "0cee4771fb3ab1def4fc4a01b7f5550ae36db0755035b0c426999702c30b6422"}, + "logger_file_backend": {:hex, :logger_file_backend, "0.0.11", "3bbc5f31d3669e8d09d7a9443e86056fae7fc18e45c6f748c33b8c79a7e147a1", [:mix], [], "hexpm", "62be826f04644c62b0a2bc98a13e2e7ae52c0a4eda020f4c59d7287356d5e445"}, "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"}, "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"}, "parse_trans": {:hex, :parse_trans, "3.3.0", "09765507a3c7590a784615cfd421d101aec25098d50b89d7aa1d66646bc571c1", [:rebar3], [], "hexpm", "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960"},