diff --git a/RFS/src/main/java/com/rfs/RunRfsWorker.java b/RFS/src/main/java/com/rfs/RunRfsWorker.java index abcb7ac12..f5734b594 100644 --- a/RFS/src/main/java/com/rfs/RunRfsWorker.java +++ b/RFS/src/main/java/com/rfs/RunRfsWorker.java @@ -172,7 +172,7 @@ public static void main(String[] args) throws Exception { documentsWorker.run(); } catch (Runner.PhaseFailed e) { - logPhaseFailureRecord(e.phase, e.nextStep, e.cmsEntry, e.e); + logPhaseFailureRecord(e.phase, e.nextStep, e.cmsEntry, e.getCause()); throw e; } catch (Exception e) { logger.error("Unexpected error running RfsWorker", e); @@ -180,7 +180,7 @@ public static void main(String[] args) throws Exception { } } - public static void logPhaseFailureRecord(GlobalState.Phase phase, WorkerStep nextStep, Optional cmsEntry, Exception e) { + public static void logPhaseFailureRecord(GlobalState.Phase phase, WorkerStep nextStep, Optional cmsEntry, Throwable e) { ObjectNode errorBlob = new ObjectMapper().createObjectNode(); errorBlob.put("exceptionMessage", e.getMessage()); errorBlob.put("exceptionClass", e.getClass().getSimpleName()); diff --git a/RFS/src/main/java/com/rfs/worker/Runner.java b/RFS/src/main/java/com/rfs/worker/Runner.java index 03af6fed5..5b12dce07 100644 --- a/RFS/src/main/java/com/rfs/worker/Runner.java +++ b/RFS/src/main/java/com/rfs/worker/Runner.java @@ -18,7 +18,7 @@ default void run() { runInternal(); getLogger().info(getPhaseName() + " Phase is complete"); } catch (Exception e) { - getLogger().error(getPhaseName() + " Phase failed w/ an exception"); + getLogger().error(getPhaseName() + " Phase failed w/ an exception ", e); throw e; } @@ -28,14 +28,12 @@ public static class PhaseFailed extends RfsException { public final GlobalState.Phase phase; public final WorkerStep nextStep; public final Optional cmsEntry; - public final Exception e; public PhaseFailed(String message, GlobalState.Phase phase, WorkerStep nextStep, Optional cmsEntry, Exception e) { - super(message); + super(message, e); this.phase = phase; this.nextStep = nextStep; this.cmsEntry = cmsEntry; - this.e = e; } } } diff --git a/RFS/src/test/java/com/rfs/worker/DocumentsRunnerTest.java b/RFS/src/test/java/com/rfs/worker/DocumentsRunnerTest.java index cc5c5fd06..3729bc23e 100644 --- a/RFS/src/test/java/com/rfs/worker/DocumentsRunnerTest.java +++ b/RFS/src/test/java/com/rfs/worker/DocumentsRunnerTest.java @@ -44,6 +44,6 @@ void run_encountersAnException_asExpected() { assertEquals(GlobalState.Phase.DOCUMENTS_IN_PROGRESS, e.phase); assertEquals(DocumentsStep.GetEntry.class, e.nextStep.getClass()); assertEquals(Optional.empty(), e.cmsEntry); - assertEquals(testException, e.e); + assertEquals(testException, e.getCause()); } } diff --git a/RFS/src/test/java/com/rfs/worker/IndexRunnerTest.java b/RFS/src/test/java/com/rfs/worker/IndexRunnerTest.java index fd0ce72a3..2ec34bbe3 100644 --- a/RFS/src/test/java/com/rfs/worker/IndexRunnerTest.java +++ b/RFS/src/test/java/com/rfs/worker/IndexRunnerTest.java @@ -39,6 +39,6 @@ void run_encountersAnException_asExpected() { assertEquals(GlobalState.Phase.INDEX_IN_PROGRESS, e.phase); assertEquals(IndexStep.GetEntry.class, e.nextStep.getClass()); assertEquals(Optional.empty(), e.cmsEntry); - assertEquals(testException, e.e); + assertEquals(testException, e.getCause()); } } diff --git a/RFS/src/test/java/com/rfs/worker/MetadataRunnerTest.java b/RFS/src/test/java/com/rfs/worker/MetadataRunnerTest.java index 83e18c279..16a242dd3 100644 --- a/RFS/src/test/java/com/rfs/worker/MetadataRunnerTest.java +++ b/RFS/src/test/java/com/rfs/worker/MetadataRunnerTest.java @@ -39,7 +39,7 @@ void run_encountersAnException_asExpected() { assertEquals(GlobalState.Phase.METADATA_IN_PROGRESS, e.phase); assertEquals(null, e.nextStep); assertEquals(Optional.empty(), e.cmsEntry); - assertEquals(testException, e.e); + assertEquals(testException, e.getCause()); } } \ No newline at end of file diff --git a/RFS/src/test/java/com/rfs/worker/SnapshotRunnerTest.java b/RFS/src/test/java/com/rfs/worker/SnapshotRunnerTest.java index 33096a405..2c8594434 100644 --- a/RFS/src/test/java/com/rfs/worker/SnapshotRunnerTest.java +++ b/RFS/src/test/java/com/rfs/worker/SnapshotRunnerTest.java @@ -35,7 +35,7 @@ void run_encountersAnException_asExpected() { assertEquals(GlobalState.Phase.SNAPSHOT_IN_PROGRESS, e.phase); assertEquals(null, e.nextStep); assertEquals(Optional.empty(), e.cmsEntry); - assertEquals(testException, e.e); + assertEquals(testException, e.getCause()); } }