X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Ffrontend.ex;h=dc9d55646c9a949e206a57a78ccfda39f6ca0918;hb=9a320ba8149a3efae1235b3b68dbf1bbad423e0d;hp=bf935a72855e2c6587458dae510454504dba58fe;hpb=a1056aace19d5f6201f06937a93f978917df8418;p=akkoma diff --git a/lib/pleroma/frontend.ex b/lib/pleroma/frontend.ex index bf935a728..dc9d55646 100644 --- a/lib/pleroma/frontend.ex +++ b/lib/pleroma/frontend.ex @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2020 Pleroma Authors +# Copyright © 2017-2021 Pleroma Authors # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Frontend do @@ -32,20 +32,21 @@ defmodule Pleroma.Frontend do label = "#{name} (#{ref})" tmp_dir = Path.join(dir(), "tmp") + IO.puts("Downloading #{label}...") with {_, :ok} <- {:download_or_unzip, download_or_unzip(frontend_info, tmp_dir, opts[:file])}, - Logger.info("Installing #{label} to #{dest}"), + IO.puts("Installing #{label} to #{dest}"), :ok <- install_frontend(frontend_info, tmp_dir, dest) do File.rm_rf!(tmp_dir) - Logger.info("Frontend #{label} installed to #{dest}") + IO.puts("Frontend #{label} installed to #{dest}") else {:download_or_unzip, _} -> - Logger.info("Could not download or unzip the frontend") + IO.puts("Could not download or unzip the frontend") {:error, "Could not download or unzip the frontend"} _e -> - Logger.info("Could not install the frontend") + IO.puts("Could not install the frontend") {:error, "Could not install the frontend"} end end @@ -92,7 +93,7 @@ defmodule Pleroma.Frontend do url = String.replace(frontend_info["build_url"], "${ref}", frontend_info["ref"]) with {:ok, %{status: 200, body: zip_body}} <- - Pleroma.HTTP.get(url, [], pool: :media, recv_timeout: 120_000) do + Pleroma.HTTP.get(url, [], receive_timeout: 120_000) do unzip(zip_body, dest) else {:error, e} -> {:error, e}