prepare for deploy

Author: Ecialo

config/config.exs

@@ -203,4 +203,6 @@ config :mauricio,
   }
 
 import_config "#{Mix.env}.exs"
-import_config "secret.exs"
+if Mix.env != :prod do
+  import_config "secret.exs"
+end

config/prod.exs

@@ -1 +1,7 @@
 import Config
+
+config :nadia,
+  token: System.get_env("TG_TOKEN")
+
+config :mauricio,
+  update_provider: :acceptor

config/releases.exs

@@ -1,3 +1,7 @@
+import Config
+
 config :mauricio,
   server: true,
-  url: [host: System.get_env("APP_NAME") <> ".gigalixirapp.com", port: 443]
+  url: [host: System.get_env("APP_NAME") <> ".gigalixirapp.com", port: 443],
+  cat_api_token: System.get_env("CAT_API_TOKEN"),
+  dog_api_token: System.get_env("DOG_API_TOKEN")

elixir_buildpack.config

@@ -0,0 +1,2 @@
+elixir_version=1.10.1
+erlang_version=22.2

lib/mauricio.ex

@@ -5,7 +5,9 @@ defmodule Mauricio do
     update_provider =
       case Application.get_env(:mauricio, :update_provider) do
         :poller -> [{Mauricio.Poller, []}]
-        :acceptor -> [{Mauricio.Acceptor, []}]
+        :acceptor ->
+          url = Application.get_env(:mauricio, :url)
+          [{Mauricio.Acceptor, url}]
         nil -> []
       end
 
@@ -19,6 +21,7 @@ defmodule Mauricio do
   end
 
   def start_phase(:setup_webhook, :normal, _args) do
+    IO.puts("Start webhook")
     case {
       Application.get_env(:mauricio, :update_provider),
       Application.get_env(:mauricio, :url)

lib/mauricio/acceptor.ex

@@ -1,5 +1,4 @@
 defmodule Mauricio.Acceptor do
-  # require Logger
   alias Mauricio.CatChat
   @behaviour :elli_handler
 
@@ -41,11 +40,20 @@ defmodule Mauricio.Acceptor do
     )
   end
 
+  def child_spec(args) do
+    %{
+      id: __MODULE__,
+      start: {Mauricio.Acceptor, :start_link, [args]}
+    }
+  end
+
   def tg_token do
     @tg_token
   end
 
-  def set_webhook(host) do
-    Nadia.set_webhook(url: "#{host}/#{@tg_token}")
+  def set_webhook(url) do
+    host = url[:host]
+    port = url[:port]
+    Nadia.set_webhook(url: "#{host}:#{port}/#{@tg_token}")
   end
 end

mix.exs

@@ -5,7 +5,7 @@ defmodule Mauricio.MixProject do
     [
       app: :mauricio,
       version: "0.1.0",
-      elixir: "~> 1.9",
+      elixir: "~> 1.10",
       start_permanent: Mix.env() == :prod,
       deps: deps()
     ]
@@ -15,7 +15,7 @@ defmodule Mauricio.MixProject do
   def application do
     [
       applications: [:nadia],
-      extra_applications: [:logger],
+      extra_applications: [:logger, :elli],
       mod: {Mauricio, []},
       start_phases: [setup_webhook: []],
     ]
@@ -24,15 +24,13 @@ defmodule Mauricio.MixProject do
   # Run "mix help deps" to learn about dependencies.
   defp deps do
     [
+      {:elli, "~> 3.2"},
       {:nadia, "~> 0.6.0"},
-      {:elli, "~> 3.0"},
       {:jason, "~> 1.1"},
       {:bookish_spork, github: "tank-bohr/bookish_spork", only: :test},
       {:ex_parameterized, "~> 1.3.7", only: :test},
       {:dialyxir, "~> 1.0.0-rc.7", only: :dev, runtime: false},
-      {:rename, "~> 0.1.0", only: :dev}
-      # {:dep_from_hexpm, "~> 0.3.0"},
-      # {:dep_from_git, git: "https://github.com/elixir-lang/my_dep.git", tag: "0.1.0"}
+      {:rename, "~> 0.1.0", only: :dev},
     ]
   end
 end

test/acceptor_test.exs

@@ -5,7 +5,8 @@ defmodule MauricioTest.Acceptor do
   alias Mauricio.CatChat.Chats
 
   setup_all do
-    assert {:ok, _server_pid} = Mauricio.Acceptor.start_link(port: 4001)
+    children = [{Mauricio.Acceptor, [port: 4001]}]
+    assert {:ok, _server_pid} = Supervisor.start_link(children, strategy: :one_for_one)
     :ok
   end
 
@@ -50,7 +51,7 @@ defmodule MauricioTest.Acceptor do
   end
 
   test "set webhook" do
-    Acceptor.set_webhook("localhost:4001")
+    Acceptor.set_webhook([host: "localhost", port: 4001])
     {:ok, request} = :bookish_spork.capture_request()
     url =
       request