Move config stuff to own Config class, cleanup readme about logging c…

README.adoc

@@ -12,10 +12,11 @@ Run with
 java -jar rlp_07.jar
 ----
 
-Listens at default port 1601 logs received content with logback.
+Listens to plain server port 1601 by default and prints received events.
 Port can be changed with "-Dport=1234" command-line argument.
 TLS mode can be enabled with "-Dtls=true" command-line argument.
 Custom server keystore can be supplied with -DtlsKeystore=path/to/file.jks
+Custom server keystore password can be supplied with -DtlsKeystorePassword=MyCustomPassword
 
 Debug output
 

src/main/assembly/jar-with-dependencies.xml

@@ -18,13 +18,4 @@
       <scope>runtime</scope>
     </dependencySet>
   </dependencySets>
-  <fileSets>
-    <fileSet>
-      <directory>${project.basedir}/src/main/config</directory>
-      <includes>
-        <include>logback.xml</include>
-      </includes>
-      <useDefaultExcludes>true</useDefaultExcludes>
-    </fileSet>
-  </fileSets>
 </assembly>

src/main/java/com/teragrep/rlp_07/Config.java

@@ -0,0 +1,35 @@
+package com.teragrep.rlp_07;
+public class Config {
+    private final int port;
+
+    public int getPort() {
+        return port;
+    }
+
+    private final boolean isTls;
+
+    public boolean isTls() {
+        return isTls;
+    }
+
+    private final String keystorePassword;
+
+    public String getKeystorePassword() {
+        return keystorePassword;
+    }
+
+    private final String keystorePath;
+    public String getKeystorePath() {
+        return keystorePath;
+    }
+    public Config() {
+        try {
+            port = Integer.parseInt(System.getProperty("port", "1601"));
+        } catch (NumberFormatException e) {
+            throw new RuntimeException("Can't parse port: " + e.getMessage());
+        }
+        isTls = Boolean.parseBoolean(System.getProperty("tls", "false"));
+        keystorePassword = System.getProperty("tlsKeystorePassword", "changeit");
+        keystorePath = System.getProperty("tlsKeystore", null);
+    }
+}

src/main/java/com/teragrep/rlp_07/Main.java

@@ -25,55 +25,57 @@ class Main {
         LOGGER.info(message);
     };
     private static final FrameProcessor syslogFrameProcessor = new SyslogFrameProcessor(byteConsumer);
+    static Config config;
 
     public static void main(String[] args) throws IOException, InterruptedException {
-        int port = Integer.parseInt(System.getProperty("port", "1601"));
-        boolean tlsMode = Boolean.parseBoolean(System.getProperty("tls", "false"));
+        config = new Config();
         try {
-            if (tlsMode) {
-                tlsServer(port);
+            if (config.isTls()) {
+                tlsServer();
             } else {
-                plainServer(port);
+                plainServer();
             }
         }
         catch (Exception e) {
             LOGGER.error("Failed to run: " + e.getMessage());
         }
     }
 
-    private static void plainServer(int port) throws IOException, InterruptedException {
-        LOGGER.info("Starting plain server on port " +port);
-        Server relpServer = new Server(port, syslogFrameProcessor);
+    private static void plainServer() throws IOException, InterruptedException {
+        LOGGER.info("Starting plain server on port " + config.getPort());
+        Server relpServer = new Server(config.getPort(), syslogFrameProcessor);
         relpServer.start();
         Thread.sleep(Long.MAX_VALUE);
     }
 
-    private static void tlsServer(int port) throws IOException, InterruptedException {
-        LOGGER.info("Starting TLS server on port " + port);
-        String keystorePath = System.getProperty("tlsKeystore");
-        InputStream keyStoreStream;
+    private static void tlsServer() throws IOException, InterruptedException {
+        LOGGER.info("Starting TLS server on port " + config.getPort());
+
+        String keystorePath = config.getKeystorePath();
+        InputStream keystoreStream;
         if(keystorePath != null) {
             LOGGER.info("Using user supplied keystore");
             Path path = Paths.get(keystorePath);
             if(!path.toFile().exists()) {
                 throw new RuntimeException("File " + keystorePath + " doesn't exist");
             }
-            keyStoreStream = Files.newInputStream(path);
+            keystoreStream = Files.newInputStream(path);
         }
         else {
             LOGGER.info("Using default keystore");
             // get server keyStore as inputstream, works on JAR packaging as well this way
-            keyStoreStream = Main.class.getClassLoader().getResourceAsStream("keystore-server.jks");
+            keystoreStream = Main.class.getClassLoader().getResourceAsStream("keystore-server.jks");
         }
+
         SSLContext sslContext;
         try {
             sslContext = TLSContextFactory.authenticatedContext(
-                keyStoreStream,
-                "changeit",
+                keystoreStream,
+                config.getKeystorePassword(),
                 "TLSv1.3"
             );
         } catch (GeneralSecurityException e) {
-            throw new RuntimeException("SSL.demoContext Error: " + e);
+            throw new RuntimeException("Can't create sslContext: " + e);
         }
 
         Function<SSLContext, SSLEngine> sslEngineFunction = sslCtx -> {
@@ -82,10 +84,8 @@ private static void tlsServer(int port) throws IOException, InterruptedException
             return sslEngine;
         };
 
-        Server relpServer = new Server(port, syslogFrameProcessor, sslContext, sslEngineFunction);
-
+        Server relpServer = new Server(config.getPort(), syslogFrameProcessor, sslContext, sslEngineFunction);
         relpServer.start();
-
         Thread.sleep(Long.MAX_VALUE);
     }
 }