Make the LogsResponder return 500 when Logger errors

onlyskin · onlyskin · commit fa6a213d747b · 2017-12-20T14:54:01.000+02:00
diff --git a/src/main/java/httpserver/Logger.java b/src/main/java/httpserver/Logger.java
@@ -30,10 +30,7 @@ private void createFileIfDoesntExist(Path path) {
         } catch (IOException e) {}
     }
 
-    public byte[] readLog() {
-        try {
-            return fileOperator.readContents(logPath);
-        } catch (IOException e) {}
-        return null;
+    public byte[] readLog() throws IOException {
+        return fileOperator.readContents(logPath);
     }
 }
diff --git a/src/main/java/httpserver/responder/special/LogsResponder.java b/src/main/java/httpserver/responder/special/LogsResponder.java
@@ -6,8 +6,11 @@
 import httpserver.responder.Responder;
 import httpserver.response.OkResponse;
 import httpserver.response.Response;
+import httpserver.response.ServerErrorResponse;
 import httpserver.response.UnauthorizedResponse;
 
+import java.io.IOException;
+
 public class LogsResponder implements Responder {
     @Override
     public Response respond(AppConfig appConfig, Request request) {
@@ -17,8 +20,12 @@ public Response respond(AppConfig appConfig, Request request) {
             return new UnauthorizedResponse();
         }
 
-        byte[] log = appConfig.getLogger().readLog();
-        return new OkResponse(log);
+        try {
+            byte[] log = appConfig.getLogger().readLog();
+            return new OkResponse(log);
+        } catch (IOException e) {
+            return new ServerErrorResponse();
+        }
     }
 
     @Override
diff --git a/src/test/java/httpserver/responder/special/LogsResponderTest.java b/src/test/java/httpserver/responder/special/LogsResponderTest.java
@@ -7,6 +7,8 @@
 import httpserver.response.Response;
 import org.junit.Test;
 
+import java.io.IOException;
+
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
@@ -25,7 +27,7 @@ public LogsResponderTest() {
     }
 
     @Test
-    public void callsReadLogOnAppConfigLogger() {
+    public void callsReadLogOnAppConfigLogger() throws Exception {
         Header[] headers = new Header[]{new Header("Authorization", "Basic YWRtaW46aHVudGVyMg==")};
         Request request = new Request("GET", "test", headers, "");
 
@@ -36,14 +38,20 @@ public void callsReadLogOnAppConfigLogger() {
     }
 
     @Test
-    public void returnsUnauthorizedResponseWhenIncorrectAuthHeader() {
-        Request request = new Request("GET", "test", new Header[0], "");
+    public void returnsUnauthorizedResponseWhenIncorrectAuthHeader() throws Exception {
+        Header[] headers = new Header[]{new Header("Authorization", "Basic YWRtaW46aHVudGVyMg==")};
+        Request request = new Request("GET", "test", headers, "");
+        when(loggerMock.readLog()).thenThrow(new IOException());
 
         Response response = logsResponder.respond(appConfigMock, request);
 
-        assertEquals(401, response.getStatusCode());
+        assertEquals(500, response.getStatusCode());
     }
 
+    @Test
+    public void returns500ResponseWhenLogErrors() throws Exception {
+        Request request = new Request("GET", "test", new Header[0], "");
+    }
     @Test
     public void handlesLogs() throws Exception {
         assertTrue(logsResponder.handles("/logs"));

Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,7 @@ private void createFileIfDoesntExist(Path path) {`
`30`	`30`	`} catch (IOException e) {}`
`31`	`31`	`}`
`32`	`32`
`33`		`- public byte[] readLog() {`
`34`		`- try {`
`35`		`- return fileOperator.readContents(logPath);`
`36`		`- } catch (IOException e) {}`
`37`		`- return null;`
	`33`	`+ public byte[] readLog() throws IOException {`
	`34`	`+ return fileOperator.readContents(logPath);`
`38`	`35`	`}`
`39`	`36`	`}`