Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 29 additions & 21 deletions lib/preview/queue.ex
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ defmodule Preview.Queue do
queue_url: url,
max_number_of_messages: concurrency,
wait_time_seconds: 10,
visibility_timeout: 120
visibility_timeout: 300
},
concurrency: 1
],
Expand All @@ -44,16 +44,19 @@ defmodule Preview.Queue do
end

def handle_message(%{data: %{"Records" => records}} = message) do
Enum.each(records, &handle_record/1)
Enum.each(records, fn record ->
run_in_task(fn -> handle_record(record) end)
end)

message
end

def handle_message(%{data: %{"preview:sitemap" => key}} = message) do
Logger.info("#{key}: start")

case key_components(key) do
{:ok, package, version} ->
try do
run_in_task(fn ->
case key_components(key) do
{:ok, package, version} ->
case extract_package(package, version) do
{:ok, _dir, file_paths} ->
update_package_sitemap(package, file_paths)
Expand All @@ -62,13 +65,11 @@ defmodule Preview.Queue do
:error ->
:ok
end
after
Preview.TmpDir.cleanup()
end

:error ->
Logger.info("#{key}: skip")
end
:error ->
Logger.info("#{key}: skip")
end
end)

message
end
Expand Down Expand Up @@ -190,17 +191,13 @@ defmodule Preview.Queue do
end

def create_package(package, version) do
try do
case extract_package(package, version) do
{:ok, dir, file_paths} ->
Preview.Bucket.put_files(package, version, dir, file_paths)
{:ok, file_paths}
case extract_package(package, version) do
{:ok, dir, file_paths} ->
Preview.Bucket.put_files(package, version, dir, file_paths)
{:ok, file_paths}

:error ->
:error
end
after
Preview.TmpDir.cleanup()
:error ->
:error
end
end

Expand Down Expand Up @@ -254,6 +251,17 @@ defmodule Preview.Queue do
end)
end

defp run_in_task(fun) do
task = Task.Supervisor.async(Preview.Tasks, fun)

case Task.yield(task, :timer.seconds(270)) || Task.shutdown(task) do
{:ok, result} -> result
{:exit, {exception, stacktrace}} -> reraise(exception, stacktrace)
{:exit, reason} -> exit(reason)
nil -> raise "task timeout"
end
end

defp purge_key(package, version) do
Preview.CDN.purge_key(:fastly_repo, [
"preview/sitemap",
Expand Down
Loading