hostname is now configureable

Author: kortemik

README.adoc

@@ -28,12 +28,14 @@ Creates Java Util Logging appender that uses RELP to ensure no events are lost.
 System.setProperty("java.util.logging.RelpHandler.default.server.address", "127.0.0.1");
 System.setProperty("java.util.logging.RelpHandler.default.server.port", "1667");
 System.setProperty("java.util.logging.RelpHandler.default.appname", "Default");
+System.setProperty("java.util.logging.RelpHandler.default.hostname", "localhost.localdomain");
 RelpHandler relpHandler_default = new RelpHandler();
 
 // Other logger
 System.setProperty("java.util.logging.RelpHandler.custom.server.address", "127.0.0.1");
 System.setProperty("java.util.logging.RelpHandler.custom.server.port", "1668");
 System.setProperty("java.util.logging.RelpHandler.custom.appname", "CustomLogger");
+System.setProperty("java.util.logging.RelpHandler.custom.hostname", "customhost.localdomain");
 RelpHandler relpHandler_custom = new RelpHandler("custom");
 
 // Reset logger and add handlers to it

src/main/java/com/teragrep/jla_04/RelpConfig.java

@@ -25,6 +25,7 @@ public class RelpConfig {
     private String address; // Relp server address
     private String appname; // appname for syslog message
     private String hostname; // hostname for syslog message
+    private String realHostName; // hostname for syslog origin header
     private String name; // logger name
     private Boolean useSD; // if structured data should be used
     private int connectionTimeout; // Relp connection timeout
@@ -39,6 +40,7 @@ public RelpConfig(String name) throws NumberFormatException, IllegalArgumentExce
         initPort();
         initAddress();
         initAppname();
+        initRealHostName();
         initHostName();
         initReconnectInterval();
         initUseSD();
@@ -105,14 +107,24 @@ public String getAppname() {
         return this.appname;
     }
 
-    private void initHostName() {
+
+
+    private void initRealHostName() {
         try {
-            this.hostname = InetAddress.getLocalHost().getHostName();
+            this.realHostName = InetAddress.getLocalHost().getHostName();
         } catch (UnknownHostException e) {
-            this.hostname = "localhost";
+            this.realHostName = "localhost";
         }
     }
 
+    public String getRealHostName() {
+        return this.realHostName;
+    }
+
+    private void initHostName() {
+        this.hostname = getProperty("hostname", "localhost");
+    }
+
     public String getHostname() {
         return this.hostname;
     }

src/main/java/com/teragrep/jla_04/RelpHandler.java

@@ -87,7 +87,7 @@ public synchronized void publish(LogRecord logRecord) {
                     .addSDParam("source", "source")
                     .addSDParam("unixtime", Long.toString(System.currentTimeMillis()));
             SDElement origin_48577 = new SDElement("origin@48577")
-                    .addSDParam("hostname", this.config.getHostname());
+                    .addSDParam("hostname", this.config.getRealHostName());
             syslog = syslog
                     .withSDElement(event_id_48577)
                     .withSDElement(origin_48577);

src/test/java/com/teragrep/jla_04/RelpHandlerTest.java

@@ -34,11 +34,13 @@ public void testUsage() {
             System.setProperty("java.util.logging.RelpHandler.custom.server.address", "127.0.0.1");
             System.setProperty("java.util.logging.RelpHandler.custom.server.port", "1666");
             System.setProperty("java.util.logging.RelpHandler.custom.appname", "custom");
+            System.setProperty("java.util.logging.RelpHandler.custom.hostname", "customhost");
 
             // Default logger name
             System.setProperty("java.util.logging.RelpHandler.default.server.address", "127.0.0.1");
             System.setProperty("java.util.logging.RelpHandler.default.server.port", "1667");
             System.setProperty("java.util.logging.RelpHandler.default.appname", "Default");
+            System.setProperty("java.util.logging.RelpHandler.default.hostname", "localhost");
 
             // Create handlers
             RelpHandler relpHandler_custom = new RelpHandler("custom");
@@ -65,6 +67,7 @@ public void testSD() {
             System.setProperty("java.util.logging.RelpHandler.withsd.server.address", "127.0.0.1");
             System.setProperty("java.util.logging.RelpHandler.withsd.server.port", "1666");
             System.setProperty("java.util.logging.RelpHandler.withsd.appname", "withsd");
+            System.setProperty("java.util.logging.RelpHandler.withsd.hostname", "sdhost");
             System.setProperty("java.util.logging.RelpHandler.withsd.useStructuredData", "true");
 
             // Create handlers