Use loggingTag to better understand log mixing client and server.

eclipse-leshan · Nov 7, 2019 · 480d886 · 480d886
1 parent a8b8354
commit 480d886
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/...an-client-cf/src/main/java/org/eclipse/leshan/client/californium/LeshanClientBuilder.java b/...an-client-cf/src/main/java/org/eclipse/leshan/client/californium/LeshanClientBuilder.java
@@ -198,7 +198,7 @@ public LeshanClient build() {
             coapConfig = createDefaultNetworkConfig();
         }
         if (endpointFactory == null) {
-            endpointFactory = new DefaultEndpointFactory() {
+            endpointFactory = new DefaultEndpointFactory("LWM2M Client") {
                 @Override
                 protected EndpointContextMatcher createSecuredContextMatcher() {
                     return null; // use default californium one.

diff --git a/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/DefaultEndpointFactory.java b/leshan-core-cf/src/main/java/org/eclipse/leshan/core/californium/DefaultEndpointFactory.java
@@ -38,10 +38,18 @@ public class DefaultEndpointFactory implements EndpointFactory {
 
     protected EndpointContextMatcher securedContextMatcher;
     protected EndpointContextMatcher unsecuredContextMatcher;
+    protected String loggingTag;
 
     public DefaultEndpointFactory() {
+        this(null);
+    }
+
+    public DefaultEndpointFactory(String loggingTag) {
         securedContextMatcher = createSecuredContextMatcher();
         unsecuredContextMatcher = createUnsecuredContextMatcher();
+        if (loggingTag != null) {
+            this.loggingTag = loggingTag;
+        }
     }
 
     /**
@@ -82,6 +90,11 @@ protected CoapEndpoint.Builder createUnsecuredEndpointBuilder(InetSocketAddress
         CoapEndpoint.Builder builder = new CoapEndpoint.Builder();
         builder.setConnector(createUnsecuredConnector(address));
         builder.setNetworkConfig(coapConfig);
+        if (loggingTag != null) {
+            builder.setLoggingTag("[" + loggingTag + "-coap://]");
+        } else {
+            builder.setLoggingTag("[coap://]");
+        }
         if (unsecuredContextMatcher != null) {
             builder.setEndpointContextMatcher(unsecuredContextMatcher);
         }
@@ -118,6 +131,11 @@ protected CoapEndpoint.Builder createSecuredEndpointBuilder(DtlsConnectorConfig
         CoapEndpoint.Builder builder = new CoapEndpoint.Builder();
         builder.setConnector(createSecuredConnector(dtlsConfig));
         builder.setNetworkConfig(coapConfig);
+        if (loggingTag != null) {
+            builder.setLoggingTag("[" + loggingTag + "-coaps://]");
+        } else {
+            builder.setLoggingTag("[coaps://]");
+        }
         if (securedContextMatcher != null) {
             builder.setEndpointContextMatcher(securedContextMatcher);
         }

diff --git a/...an-server-cf/src/main/java/org/eclipse/leshan/server/californium/LeshanServerBuilder.java b/...an-server-cf/src/main/java/org/eclipse/leshan/server/californium/LeshanServerBuilder.java
@@ -393,7 +393,7 @@ public LeshanServer build() {
         if (registrationIdProvider == null)
             registrationIdProvider = new RandomStringRegistrationIdProvider();
         if (endpointFactory == null) {
-            endpointFactory = new DefaultEndpointFactory();
+            endpointFactory = new DefaultEndpointFactory("LWM2M Server");
         }
 
         // handle dtlsConfig

diff --git a/...in/java/org/eclipse/leshan/server/californium/bootstrap/LeshanBootstrapServerBuilder.java b/...in/java/org/eclipse/leshan/server/californium/bootstrap/LeshanBootstrapServerBuilder.java
@@ -426,7 +426,7 @@ public BootstrapHandler create(BootstrapConfigStore store, LwM2mBootstrapRequest
             coapConfig = createDefaultNetworkConfig();
         }
         if (endpointFactory == null) {
-            endpointFactory = new DefaultEndpointFactory();
+            endpointFactory = new DefaultEndpointFactory("LWM2M BS Server");
         }
         if (encoder == null)
             encoder = new DefaultLwM2mNodeEncoder();