Merge branch 'feature/utc_datetimes'

Author: aspett

README.md

@@ -73,26 +73,36 @@ Note: You should read [how to install honeydew here first](https://github.com/ko
 This queue takes some additional options. An example below,
 
 ```elixir
-import Supervisor.Spec
-
 def background_job_processes do
   [
     notifier_process(),
-    Honeydew.queue_spec(:process, # queue_name
-      queue: {HoneydewEctoNotifyQueue, [
-                  repo: YourApp.Repo, # your app's Repo module
-                  max_job_time: 3_600, # seconds
-                  retry_seconds: 15, # seconds,
-                  notifier: YourApp.Notifier # this should match the `name:` in `notifier_process` below
-                ]},
-      failure_mode: {Honeydew.FailureMode.Retry, times: 3}
-    ),
-    Honeydew.worker_spec(:process, YourApp.Worker, num: 1)
+    {
+      Honeydew.Queues,
+      [
+        :process, # queue name
+        queue: {
+          HoneydewEctoNotifyQueue, [
+            repo: YourApp.Repo,
+            max_job_time: 3_600, # seconds
+            retry_seconds: 15, # seconds,
+            notifier: YourApp.Notifier # this should match the `name` in `notifier_process` below
+          ]
+        },
+        failure_mode: {Honeydew.FailureMode.Retry, times: 3}
+      ]
+    },
+    {
+      Honeydew.Workers,
+      [:process, YourApp.Workers.ProcessWorker, num: 1]
+    }
   ]
 end
 
 def notifier_process do
-  worker(Postgrex.Notifications, [YourApp.Repo.config() ++ [name: YourApp.Notifier]])
+  %{
+    id: Postgrex.Notifications,
+    start: {Postgrex.Notifications, :start_link, [YourApp.Repo.config() ++ [name: YourApp.Notifier]]}
+  }
 end
 
 def start(_type, _args) do

lib/honeydew_ecto_notify_queue/config.ex

@@ -55,7 +55,8 @@ defmodule HoneydewEctoNotifyQueue.Config do
       iex> update_config(Repo, "queueing_mode", "manual")
       {:ok, %JobConfig{}}
   """
-  @spec update_config(Repo.t(), JobConfig.t() | String.t(), String.t()) :: {:ok, JobConfig.t()} | {:error, any}
+  @spec update_config(Repo.t(), JobConfig.t() | String.t(), String.t()) ::
+          {:ok, JobConfig.t()} | {:error, any}
   def update_config(repo, %JobConfig{} = config, value) when is_binary(value) do
     config
     |> JobConfig.changeset(%{value: value})

lib/honeydew_ecto_notify_queue/jobs/job.ex

@@ -10,12 +10,12 @@ defmodule HoneydewEctoNotifyQueue.Job do
     field :function, :string
     field :arguments, :map
     field :failure_state, :map
-    field :reserved_at, :naive_datetime
-    field :acked_at, :naive_datetime
-    field :abandoned_at, :naive_datetime
-    field :nacked_until, :naive_datetime
+    field :reserved_at, :utc_datetime_usec
+    field :acked_at, :utc_datetime_usec
+    field :abandoned_at, :utc_datetime_usec
+    field :nacked_until, :utc_datetime_usec
 
-    timestamps()
+    timestamps(type: :utc_datetime_usec)
   end
 
   def changeset(%__MODULE__{} = job, attrs) do

lib/honeydew_ecto_notify_queue/jobs/job_config.ex

@@ -8,10 +8,10 @@ defmodule HoneydewEctoNotifyQueue.JobConfig do
 
   @primary_key {:id, :binary_id, autogenerate: true}
   schema "job_configs" do
-    field(:key, :string)
-    field(:value, :string)
+    field :key, :string
+    field :value, :string
 
-    timestamps()
+    timestamps(type: :utc_datetime_usec)
   end
 
   def changeset(%__MODULE__{} = config, attrs) do

mix.exs

@@ -38,22 +38,26 @@ defmodule HoneydewEctoNotifyQueue.MixProject do
       {:postgrex, "~> 0.14"},
       {:poison, "~> 3.1"},
       {:honeydew, "~> 1.1.5"},
-      {:jason, "~> 1.1"},
+      {:jason, "~> 1.1"}
     ]
   end
 
   defp package do
-    [maintainers: ["Andrew Pett"],
-     licenses: ["MIT"],
-     links: %{"GitHub": "https://github.com/aspett/honeydew-ecto-notify-queue"}]
+    [
+      maintainers: ["Andrew Pett"],
+      licenses: ["MIT"],
+      links: %{GitHub: "https://github.com/aspett/honeydew-ecto-notify-queue"}
+    ]
   end
 
   defp docs do
-    [extras: ["README.md"],
-     source_url: "https://github.com/aspett/honeydew-ecto-notify-queue",
-     assets: "assets",
-     main: "readme",
-     source_ref: @version]
+    [
+      extras: ["README.md"],
+      source_url: "https://github.com/aspett/honeydew-ecto-notify-queue",
+      assets: "assets",
+      main: "readme",
+      source_ref: @version
+    ]
   end
 
   defp aliases do

priv/repo/migrations/20180702161041_honeydew_ecto_notify_jobs.exs

@@ -8,10 +8,10 @@ defmodule HoneydewEctoNotifyQueue.Repo.Migrations.CreateHoneydewEctoNotifyTables
       add :function, :string
       add :arguments, :jsonb
       add :failure_state, :jsonb
-      add :reserved_at, :naive_datetime
-      add :nacked_until, :naive_datetime
-      add :acked_at, :naive_datetime
-      add :abandoned_at, :naive_datetime
+      add :reserved_at, :utc_datetime_usec
+      add :nacked_until, :utc_datetime_usec
+      add :acked_at, :utc_datetime_usec
+      add :abandoned_at, :utc_datetime_usec
 
       timestamps()
     end

priv/templates/migration.exs.eex

@@ -8,12 +8,12 @@ defmodule <%= module_prefix %>.Repo.Migrations.CreateHoneydewEctoNotifyTables do
       add :function, :string
       add :arguments, :jsonb
       add :failure_state, :jsonb
-      add :reserved_at, :naive_datetime
-      add :nacked_until, :naive_datetime
-      add :acked_at, :naive_datetime
-      add :abandoned_at, :naive_datetime
+      add :reserved_at, :utc_datetime_usec
+      add :nacked_until, :utc_datetime_usec
+      add :acked_at, :utc_datetime_usec
+      add :abandoned_at, :utc_datetime_usec
 
-      timestamps()
+      timestamps(type: :utc_datetime_usec)
     end
 
     create index(:jobs, [:reserved_at, :acked_at, :nacked_until], using: :btree)
@@ -25,7 +25,7 @@ defmodule <%= module_prefix %>.Repo.Migrations.CreateHoneydewEctoNotifyTables do
       add :key, :string, null: false
       add :value, :string, null: false
 
-      timestamps()
+      timestamps(type: :utc_datetime_usec)
     end
 
     create unique_index(:job_configs, [:key], using: :btree)

test/honeydew_ecto_notify_queue_integration_test.exs

@@ -34,17 +34,22 @@ defmodule HoneydewEctoNotifyQueueIntegrationTest do
     :ok = Ecto.Adapters.SQL.Sandbox.checkout(Repo)
     Ecto.Adapters.SQL.Sandbox.mode(Repo, {:shared, self()})
 
-    queue = :"#{:erlang.monotonic_time}_#{:erlang.unique_integer}"
-
-    spec = Honeydew.queue_spec(queue,
-      queue: {HoneydewEctoNotifyQueue, [
-                 repo: HoneydewEctoNotifyQueue.Repo,
-                 max_job_time: 3_600, # seconds
-                 retry_seconds: 15, # seconds,
-                 notifier: Notifier
-               ]},
-      failure_mode: {Honeydew.FailureMode.Retry, times: 3}
-    )
+    queue = :"#{:erlang.monotonic_time()}_#{:erlang.unique_integer()}"
+
+    spec =
+      Honeydew.queue_spec(queue,
+        queue:
+          {HoneydewEctoNotifyQueue,
+           [
+             repo: HoneydewEctoNotifyQueue.Repo,
+             # seconds
+             max_job_time: 3_600,
+             # seconds,
+             retry_seconds: 15,
+             notifier: Notifier
+           ]},
+        failure_mode: {Honeydew.FailureMode.Retry, times: 3}
+      )
 
     {_queue, {queue_module, startfn, args}, restart, timeout, type, _module} = spec