From d9a4aed3b3675446d399d195eff0bee77ba63232 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Sat, 1 Dec 2018 17:38:45 +0300 Subject: replace try/catch with File.Exists? in dev.exs --- config/dev.exs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'config') diff --git a/config/dev.exs b/config/dev.exs index 7b06ad67e..166be721a 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -49,11 +49,10 @@ config :pleroma, Pleroma.Repo, hostname: "localhost", pool_size: 10 -try do +if File.exists?("./config/dev.secret.exs") do import_config "dev.secret.exs" -rescue - _ -> - IO.puts( - "!!! RUNNING IN LOCALHOST DEV MODE! !!!\nFEDERATION WON'T WORK UNTIL YOU CONFIGURE A dev.secret.exs" - ) +else + IO.puts( + "!!! RUNNING IN LOCALHOST DEV MODE! !!!\nFEDERATION WON'T WORK UNTIL YOU CONFIGURE A dev.secret.exs" + ) end -- cgit v1.2.3 From 3ce16e5a56be01686a03f40931f666ac164df6e8 Mon Sep 17 00:00:00 2001 From: Maksim Pechnikov Date: Sat, 1 Dec 2018 08:26:59 +0300 Subject: init tesla and updated the http requests in Pleroma.Web.Websub --- config/config.exs | 1 + config/test.exs | 1 + 2 files changed, 2 insertions(+) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index 12f47389c..8d2fdd40d 100644 --- a/config/config.exs +++ b/config/config.exs @@ -72,6 +72,7 @@ config :mime, :types, %{ config :pleroma, :websub, Pleroma.Web.Websub config :pleroma, :ostatus, Pleroma.Web.OStatus config :pleroma, :httpoison, Pleroma.HTTP +config :tesla, adapter: Tesla.Adapter.Hackney # Configures http settings, upstream proxy etc. config :pleroma, :http, proxy_url: nil diff --git a/config/test.exs b/config/test.exs index 3aaed1b2c..e259a9c65 100644 --- a/config/test.exs +++ b/config/test.exs @@ -26,6 +26,7 @@ config :pbkdf2_elixir, rounds: 1 config :pleroma, :websub, Pleroma.Web.WebsubMock config :pleroma, :ostatus, Pleroma.Web.OStatusMock config :pleroma, :httpoison, HTTPoisonMock +config :tesla, adapter: Tesla.Mock try do import_config "test.secret.exs" -- cgit v1.2.3 From ec34de0c1fd58942c8ecefddef92696750b70420 Mon Sep 17 00:00:00 2001 From: Maksim Pechnikov Date: Sun, 2 Dec 2018 16:58:38 +0300 Subject: WebSub fix test --- config/test.exs | 1 - 1 file changed, 1 deletion(-) (limited to 'config') diff --git a/config/test.exs b/config/test.exs index e259a9c65..6f6227c20 100644 --- a/config/test.exs +++ b/config/test.exs @@ -25,7 +25,6 @@ config :pbkdf2_elixir, rounds: 1 config :pleroma, :websub, Pleroma.Web.WebsubMock config :pleroma, :ostatus, Pleroma.Web.OStatusMock -config :pleroma, :httpoison, HTTPoisonMock config :tesla, adapter: Tesla.Mock try do -- cgit v1.2.3