Change Logger#log to catch IOException and print to injected PrintStream when it fails to log

onlyskin · onlyskin · commit 67fbb1538c66 · 2018-01-12T13:04:32.000+02:00
diff --git a/src/main/java/httpserver/App.java b/src/main/java/httpserver/App.java
@@ -16,7 +16,7 @@ public static void main(String[] args) throws IOException {
         PathExaminer pathExaminer = new PathExaminer();
         Path root = pathExaminer.getPath(fileDirectory);
         Path logPath = pathExaminer.concatenate(root,"logs");
-        AppConfig appConfig = new AppConfig(root, new Logger(logPath, new FileOperator()));
+        AppConfig appConfig = new AppConfig(root, new Logger(logPath, new FileOperator(), System.out));
 
         ServerFactory serverFactory = new ServerFactory(new ServerSocketFactory(), appConfig);
         SocketHandlerFactory socketHandlerFactory = new SocketHandlerFactory();
diff --git a/src/main/java/httpserver/Logger.java b/src/main/java/httpserver/Logger.java
@@ -3,21 +3,28 @@
 import httpserver.file.FileOperator;
 
 import java.io.IOException;
+import java.io.PrintStream;
 import java.nio.file.Path;
 
 public class Logger {
     private final FileOperator fileOperator;
     private final Path logPath;
+    private final PrintStream printStream;
 
-    public Logger(Path logPath, FileOperator fileOperator) throws IOException {
+    public Logger(Path logPath, FileOperator fileOperator, PrintStream printStream) throws IOException {
         this.fileOperator = fileOperator;
         this.logPath = logPath;
+        this.printStream = printStream;
         createFileIfDoesntExist(logPath);
     }
 
-    public void log(String logString) throws IOException {
+    public void log(String logString) {
         byte[] logBytes = (logString + "\r\n").getBytes();
-        fileOperator.appendToFile(logPath, logBytes);
+        try {
+            fileOperator.appendToFile(logPath, logBytes);
+        } catch (IOException e) {
+            printStream.print(e);
+        }
     }
 
     private void createFileIfDoesntExist(Path path) {
diff --git a/src/main/java/httpserver/SocketHandler.java b/src/main/java/httpserver/SocketHandler.java
@@ -50,11 +50,7 @@ private void closeStream() {
         try {
             inputStream.close();
         } catch (IOException e) {
-            try {
-                appConfig.getLogger().log(e.toString());
-            } catch (IOException e1) {
-                e1.printStackTrace();
-            }
+            appConfig.getLogger().log(e.toString());
         }
     }
 }
diff --git a/src/test/java/httpserver/LoggerTest.java b/src/test/java/httpserver/LoggerTest.java
@@ -4,6 +4,7 @@
 import org.junit.Test;
 
 import java.io.IOException;
+import java.io.PrintStream;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
@@ -13,25 +14,27 @@
 import static java.nio.file.Files.write;
 import static java.nio.file.Files.exists;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class LoggerTest {
 
     private final Path logPath;
     private final Logger logger;
+    private final PrintStream printStreamMock;
 
     public LoggerTest() throws IOException {
         logPath = Paths.get(tempDir().toString(), "logs");
-        logger = new Logger(logPath, new FileOperator());
+        printStreamMock = mock(PrintStream.class);
+        logger = new Logger(logPath, new FileOperator(), printStreamMock);
     }
+
     @Test
     public void createsLogFileOnConstructDoesntOverwrite() throws Exception {
         assertTrue(exists(logPath));
 
         write(logPath, "fake log line\r\n".getBytes(),
                 StandardOpenOption.APPEND);
 
-        new Logger(logPath, new FileOperator());
-
         assertEquals("fake log line\r\n", new String(readAllBytes(logPath)));
     }
 
@@ -44,4 +47,15 @@ public void writesToLogAndReadsFromLog() throws Exception {
 
         assertEquals("POST example\r\nHEAD example\r\n", log);
     }
+
+    @Test
+    public void printsErrorToStdoutIfCantWriteToLog() throws Exception {
+        FileOperator fileOperatorMock = mock(FileOperator.class);
+        doThrow(new IOException()).when(fileOperatorMock).appendToFile(any(), any());
+        Logger logger = new Logger(logPath, fileOperatorMock, printStreamMock);
+
+        logger.log("");
+
+        verify(printStreamMock).print(any(Exception.class));
+    }
 }
diff --git a/src/test/java/httpserver/SocketHandlerTest.java b/src/test/java/httpserver/SocketHandlerTest.java
@@ -35,7 +35,7 @@ public class SocketHandlerTest {
 
     public SocketHandlerTest() throws IOException {
         root = tempDir();
-        logger = new Logger(root.resolve("logs"), new FileOperator());
+        logger = new Logger(root.resolve("logs"), new FileOperator(), System.out);
         appConfig = new AppConfig(root, logger);
         relativePath1 = root.relativize(tempFileOptions(root, "aaa", "temp"));
         relativePath2 = root.relativize(tempFileOptions(root, "bbb", "temp"));

Original file line number	Diff line number	Diff line change
`@@ -50,11 +50,7 @@ private void closeStream() {`
`50`	`50`	`try {`
`51`	`51`	`inputStream.close();`
`52`	`52`	`} catch (IOException e) {`
`53`		`- try {`
`54`		`- appConfig.getLogger().log(e.toString());`
`55`		`- } catch (IOException e1) {`
`56`		`- e1.printStackTrace();`
`57`		`- }`
	`53`	`+ appConfig.getLogger().log(e.toString());`
`58`	`54`	`}`
`59`	`55`	`}`
`60`	`56`	`}`