Commit 2583a9f6 authored by lain's avatar lain

More logging.

parent eb3f14da
......@@ -288,6 +288,8 @@ def fetch_and_prepare_user_from_ap_id(ap_id) do
}
{:ok, user_data}
else
e -> Logger.error("Could not user at fetch #{ap_id}, #{inspect(e)}")
end
end
......@@ -353,12 +355,12 @@ def fetch_object_from_id(id) do
{:ok, Object.get_by_ap_id(activity.data["object"]["id"])}
else
object = %Object{} -> {:ok, object}
e ->
Logger.info("Couldn't get object via AP, trying out OStatus fetching...")
case OStatus.fetch_activity_from_url(id) do
{:ok, [activity | _]} -> {:ok, Object.get_by_ap_id(activity.data["object"]["id"])}
_ -> e
end
e ->
Logger.info("Couldn't get object via AP, trying out OStatus fetching...")
case OStatus.fetch_activity_from_url(id) do
{:ok, [activity | _]} -> {:ok, Object.get_by_ap_id(activity.data["object"]["id"])}
e -> e
end
end
end
end
......
......@@ -292,7 +292,10 @@ def fetch_activity_from_atom_url(url) do
with {:ok, %{body: body, status_code: code}} when code in 200..299 <- @httpoison.get(url, [Accept: "application/atom+xml"], follow_redirect: true, timeout: 10000, recv_timeout: 20000) do
Logger.debug("Got document from #{url}, handling...")
handle_incoming(body)
else e -> Logger.debug("Couldn't get #{url}: #{inspect(e)}")
else
e ->
Logger.debug("Couldn't get #{url}: #{inspect(e)}")
e
end
end
......@@ -301,7 +304,10 @@ def fetch_activity_from_html_url(url) do
with {:ok, %{body: body}} <- @httpoison.get(url, [], follow_redirect: true, timeout: 10000, recv_timeout: 20000),
{:ok, atom_url} <- get_atom_url(body) do
fetch_activity_from_atom_url(atom_url)
else e -> Logger.debug("Couldn't get #{url}: #{inspect(e)}")
else
e ->
Logger.debug("Couldn't get #{url}: #{inspect(e)}")
e
end
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment