hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'feld-Logger' into 'develop'

Browse source 
Logging cleanup

See merge request pleroma/pleroma!76
This commit is contained in:
lambda 2018-03-20 05:57:47 +00:00
commit 9b97b023c5
12 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -301,7 +301,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
{:ok, data} <- Poison.decode(body) do
user_data_from_user_object(data)
else
e -> Logger.error("Could not user at fetch #{ap_id}, #{inspect(e)}")
e -> Logger.error("Could not decode user at fetch #{ap_id}, #{inspect(e)}")
end
end
@ -321,7 +321,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
with {:ok, %{"ap_id" => ap_id}} when not is_nil(ap_id) <- WebFinger.finger(nickname) do
make_user_from_ap_id(ap_id)
else
_e -> {:error, "No ap id in webfinger"}
_e -> {:error, "No AP id in WebFinger"}
end
end

4
lib/pleroma/web/activity_pub/activity_pub_controller.ex
View file

@ -36,9 +36,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
def inbox(conn, params) do
headers = Enum.into(conn.req_headers, %{})
if !(String.contains?(headers["signature"] || "", params["actor"])) do
Logger.info("Signature not from author, relayed message, ignoring.")
Logger.info("Signature not from author, relayed message, ignoring")
else
Logger.info("Signature error.")
Logger.info("Signature error")
Logger.info("Could not validate #{params["actor"]}")
Logger.info(inspect(conn.req_headers))
end