tidy up

apache · Dec 25, 2023 · 74cdb9a · 74cdb9a
1 parent 45cdc8c
commit 74cdb9a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 30 deletions.
diff --git a/src/main/java/org/apache/log4j/net/ECSLogEvent.java b/src/main/java/org/apache/log4j/net/ECSLogEvent.java
@@ -18,7 +18,7 @@
 
 import com.owlike.genson.annotation.JsonProperty;
 import java.time.ZonedDateTime;
-import java.util.List;
+
 import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent;
 import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEventBuilder;
 
@@ -35,20 +35,19 @@ public class ECSLogEvent {
     public String message;
 
     @JsonProperty("process.thread.name")
-    public String thread_name;
+    public String threadName;
 
     @JsonProperty("log.logger")
     public String logger;
 
-    public List<String> tags;
 
     ChainsawLoggingEvent toChainsawLoggingEvent(ChainsawLoggingEventBuilder build) {
         build.clear();
 
         build.setLevelFromString(level)
                 .setMessage(message)
                 .setLogger(logger)
-                .setThreadName(thread_name)
+                .setThreadName(threadName)
                 .setTimestamp(ZonedDateTime.parse(timestamp).toInstant());
 
         return build.create();

diff --git a/src/main/java/org/apache/log4j/net/UDPReceiver.java b/src/main/java/org/apache/log4j/net/UDPReceiver.java
@@ -34,6 +34,8 @@
  * @author Scott Deboy &lt;sdeboy@apache.org&gt;
  */
 public class UDPReceiver extends ChainsawReceiverSkeleton implements PortBased {
+    private static final Logger logger = LogManager.getLogger(UDPReceiver.class);
+
     private static final int PACKET_LENGTH = 16384;
     private UDPReceiverThread receiverThread;
     private String encoding;
@@ -46,8 +48,6 @@ public class UDPReceiver extends ChainsawReceiverSkeleton implements PortBased {
     private DatagramSocket socket;
     private boolean active = true;
 
-    private static final Logger logger = LogManager.getLogger();
-
     /**
      * The MulticastDNS zone advertised by a UDPReceiver
      */
@@ -85,7 +85,7 @@ public void setDecoder(String decoder) {
     }
 
     public synchronized void shutdown() {
-        if (closed == true) {
+        if (closed) {
             return;
         }
         closed = true;
@@ -101,6 +101,7 @@ public synchronized void shutdown() {
                 receiverThread.join();
             }
         } catch (InterruptedException ie) {
+            logger.error(ie, ie);
         }
     }
 
@@ -147,8 +148,7 @@ public void run() {
                 try {
                     socket.receive(p);
 
-                    // this string constructor which accepts a charset throws an exception if it is
-                    // null
+                    // this string constructor which accepts a charset throws an exception if it is null
                     String data;
                     if (encoding == null) {
                         data = new String(p.getData(), 0, p.getLength());
@@ -166,8 +166,6 @@ public void run() {
                     ioe.printStackTrace();
                 }
             }
-
-            // LogLog.debug(UDPReceiver.this.getName() + "'s thread is ending.");
         }
     }
 }
diff --git a/src/main/java/org/apache/log4j/net/UDPReceiverFactory.java b/src/main/java/org/apache/log4j/net/UDPReceiverFactory.java
@@ -21,9 +21,6 @@
 import org.apache.log4j.chainsaw.receiver.ChainsawReceiver;
 import org.apache.log4j.chainsaw.receiver.ChainsawReceiverFactory;
 
-/**
- *
- */
 public class UDPReceiverFactory implements ChainsawReceiverFactory {
 
     @Override

diff --git a/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java b/src/main/java/org/apache/log4j/net/XMLSocketReceiver.java
@@ -17,17 +17,18 @@
 package org.apache.log4j.net;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.io.InputStream;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.List;
-import java.util.Vector;
 import org.apache.log4j.chainsaw.logevents.ChainsawLoggingEvent;
 import org.apache.log4j.chainsaw.receiver.ChainsawReceiverSkeleton;
 import org.apache.log4j.spi.Decoder;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.io.InputStream;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * XMLSocketReceiver receives a remote logging event via XML on a configured
  * socket and "posts" it to a LoggerRepository as if the event were
@@ -49,17 +50,17 @@
  * @author Scott Deboy &lt;sdeboy@apache.org&gt;
  */
 public class XMLSocketReceiver extends ChainsawReceiverSkeleton implements Runnable, PortBased {
+    private static final Logger logger = LogManager.getLogger(XMLSocketReceiver.class);
+
     // default to log4j xml decoder
     protected String decoder = "org.apache.log4j.xml.XMLDecoder";
     private ServerSocket serverSocket;
-    private List<Socket> socketList = new Vector<>();
+    private List<Socket> socketList = new ArrayList<>();
     private Thread rThread;
     public static final int DEFAULT_PORT = 4448;
     protected int port = DEFAULT_PORT;
     private boolean active = false;
 
-    private static final Logger logger = LogManager.getLogger();
-
     /**
      * The MulticastDNS zone advertised by an XMLSocketReceiver
      */
@@ -70,8 +71,6 @@ public class XMLSocketReceiver extends ChainsawReceiverSkeleton implements Runna
      * _log4j_xml_tcpconnect_appender.local.
      */
 
-    public XMLSocketReceiver() {}
-
     /**
      * Get the port to receive logging events on.
      */
@@ -82,8 +81,8 @@ public int getPort() {
     /**
      * Set the port to receive logging events on.
      */
-    public void setPort(int _port) {
-        port = _port;
+    public void setPort(int port) {
+        this.port = port;
     }
 
     public String getDecoder() {
@@ -93,8 +92,8 @@ public String getDecoder() {
     /**
      * Specify the class name implementing org.apache.log4j.spi.Decoder that can process the file.
      */
-    public void setDecoder(String _decoder) {
-        decoder = _decoder;
+    public void setDecoder(String decoder) {
+        this.decoder = decoder;
     }
 
     /**
@@ -242,11 +241,11 @@ private void parseIncomingData(Socket sock) {
         try {
             is = sock.getInputStream();
         } catch (Exception e) {
-            is = null;
             logger.error("Exception opening InputStream to " + sock, e);
             return;
         }
 
+        // TODO: is is never updated
         while (is != null) {
             try {
                 byte[] b = new byte[1024];
@@ -272,7 +271,7 @@ private void parseIncomingData(Socket sock) {
                 is.close();
             }
         } catch (Exception e) {
-            // logger.info("Could not close connection.", e);
+            logger.error("Could not close connection.", e);
         }
     }
 }