mod_filestore: handle S3 forbidden as non retryable error.

(cherry picked from commit 23fbad1)
zotonic · Feb 28, 2017 · 0568caa · 0568caa
1 parent 9396c14
commit 0568caa
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/modules/mod_filestore/mod_filestore.erl b/modules/mod_filestore/mod_filestore.erl
@@ -181,9 +181,10 @@ load_cache(Props, Context) ->
             StreamFun = fun(CachePid) ->
                             s3filez:stream(Cred,
                                            Location1,
-                                           fun({error, enoent}) ->
-                                                    lager:error("File store remote file is gone ~p", [Location]),
-                                                    ok = m_filestore:mark_error(Id, enoent, Ctx),
+                                           fun({error, FinalError})
+                                                when FinalError =:= enoent; FinalError =:= forbidden ->
+                                                    lager:error("File store remote file is ~p ~p", [FinalError, Location]),
+                                                    ok = m_filestore:mark_error(Id, FinalError, Ctx),
                                                     exit(normal);
                                               ({error, _} = Error) ->
                                                     % Abnormal exit when receiving an error.