From 28865e2956300d5700fd98cbc718b321a525001a Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Fri, 7 Jun 2019 10:26:55 +0100 Subject: [PATCH] Don't catch `Throwable` in swap-job, catch Exception --- .../uk/ac/ic/wlgitbridge/bridge/swap/job/SwapJobImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/swap/job/SwapJobImpl.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/swap/job/SwapJobImpl.java index ce82420ea2..f989fe1341 100644 --- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/swap/job/SwapJobImpl.java +++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/swap/job/SwapJobImpl.java @@ -139,8 +139,8 @@ public class SwapJobImpl implements SwapJob { String projectName = dbStore.getOldestUnswappedProject(); try { evict(projectName); - } catch (Throwable t) { - Log.warn("[{}] Exception while swapping, mark project and move on", projectName, t); + } catch (Exception e) { + Log.warn("[{}] Exception while swapping, mark project and move on", projectName, e); // NOTE: this is something of a hack. If a project fails to swap we get stuck in a // loop where `dbStore.getOldestUnswappedProject()` gives the same failing project over and over again, // which fills up the disk with errors. By touching the access time we can mark the project as a