Make Server log error if an IOException is thrown

onlyskin · onlyskin · commit 044df430d0e9 · 2018-01-12T14:01:44.000+02:00
diff --git a/src/main/java/httpserver/Server.java b/src/main/java/httpserver/Server.java
@@ -14,14 +14,13 @@ public Server(ServerSocket serverSocket, AppConfig appConfig) {
         this.appConfig = appConfig;
     }
 
-    public void acceptConnection(ExecutorService executorService, SocketHandlerFactory socketHandlerFactory){
+    public void acceptConnection(ExecutorService executorService, SocketHandlerFactory socketHandlerFactory) {
         try {
             Socket clientSocket = serverSocket.accept();
             SocketHandler socketHandler = socketHandlerFactory.newSocketHandler(appConfig, clientSocket);
             executorService.submit(socketHandler);
         } catch (IOException e) {
-            System.out.println("Server socket error");
-            e.printStackTrace();
+            appConfig.getLogger().log(e.toString());
         }
     }
 }
diff --git a/src/test/java/httpserver/ServerTest.java b/src/test/java/httpserver/ServerTest.java
@@ -15,7 +15,7 @@ public class ServerTest {
     private final ServerSocket serverSocketMock;
     private final Socket socket;
     private final AppConfig appConfigMock;
-    private Server server;
+    private final Server server;
     private final ExecutorService executorServiceMock;
     private final SocketHandler socketHandlerMock;
 
@@ -54,4 +54,15 @@ public void callsExecutorSubmitWithSocketHandler() throws Exception {
 
         verify(executorServiceMock).submit(socketHandlerMock);
     }
+
+    @Test
+    public void acceptConnectionLogsExceptionIfThereIsAnIoException() throws Exception {
+        when(serverSocketMock.accept()).thenThrow(new IOException());
+        Logger loggerMock = mock(Logger.class);
+        when(appConfigMock.getLogger()).thenReturn(loggerMock);
+
+        server.acceptConnection(executorServiceMock, socketHandlerFactoryMock);
+
+        verify(loggerMock).log(any());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,13 @@ public Server(ServerSocket serverSocket, AppConfig appConfig) {`
`14`	`14`	`this.appConfig = appConfig;`
`15`	`15`	`}`
`16`	`16`
`17`		`- public void acceptConnection(ExecutorService executorService, SocketHandlerFactory socketHandlerFactory){`
	`17`	`+ public void acceptConnection(ExecutorService executorService, SocketHandlerFactory socketHandlerFactory) {`
`18`	`18`	`try {`
`19`	`19`	`Socket clientSocket = serverSocket.accept();`
`20`	`20`	`SocketHandler socketHandler = socketHandlerFactory.newSocketHandler(appConfig, clientSocket);`
`21`	`21`	`executorService.submit(socketHandler);`
`22`	`22`	`} catch (IOException e) {`
`23`		`- System.out.println("Server socket error");`
`24`		`- e.printStackTrace();`
	`23`	`+ appConfig.getLogger().log(e.toString());`
`25`	`24`	`}`
`26`	`25`	`}`
`27`	`26`	`}`