projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'remove-info-from-users' into 'develop'
[akkoma]
/
lib
/
pleroma
/
uploaders
/
uploader.ex
diff --git
a/lib/pleroma/uploaders/uploader.ex
b/lib/pleroma/uploaders/uploader.ex
index 0af76bc593f4e69d245678686885cf7a5f32268e..c0b22c28a4cf7af16b37767f12b7fb2ff9808a6b 100644
(file)
--- a/
lib/pleroma/uploaders/uploader.ex
+++ b/
lib/pleroma/uploaders/uploader.ex
@@
-68,7
+68,14
@@
defmodule Pleroma.Uploaders.Uploader do
{:error, error}
end
after
{:error, error}
end
after
- 30_000 -> {:error, dgettext("errors", "Uploader callback timeout")}
+ callback_timeout() -> {:error, dgettext("errors", "Uploader callback timeout")}
+ end
+ end
+
+ defp callback_timeout do
+ case Mix.env() do
+ :test -> 1_000
+ _ -> 30_000
end
end
end
end
end
end