Add a preference to enable raw logging to cf http calls

ControlSystemStudio · May 23, 2022 · 1d5013d · 1d5013d
1 parent eecd680
commit 1d5013d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/...hannel/channelfinder/src/main/java/org/phoebus/channelfinder/ChannelFinderClientImpl.java b/...hannel/channelfinder/src/main/java/org/phoebus/channelfinder/ChannelFinderClientImpl.java
@@ -74,6 +74,8 @@ public class ChannelFinderClientImpl implements ChannelFinderClient {
     private static final String resourceProperties = "resources/properties";
     private static final String resourceTags = "resources/tags";
 
+
+    private static CFProperties properties = new CFProperties();
     private static final Logger log = Logger.getLogger(ChannelFinderClient.class.getName());
     /**
      * A Builder class to help create the client to the Channelfinder Service
@@ -101,11 +103,10 @@ public static class CFCBuilder {
 
         private ExecutorService executor = Executors.newSingleThreadExecutor();
 
-        private CFProperties properties = new CFProperties();
 
         private CFCBuilder()
         {
-            this.uri = URI.create(this.properties.getPreferenceValue("serviceURL"));
+            this.uri = URI.create(properties.getPreferenceValue("serviceURL"));
             this.protocol = this.uri.getScheme();
         }
 
@@ -263,21 +264,24 @@ public boolean verify(String hostname, SSLSession session) {
                         properties.getPreferenceValue("username"),
                         properties.getPreferenceValue("password"));
             }
+
             return new ChannelFinderClientImpl(this.uri, this.clientConfig, this.httpBasicAuthFilter, this.executor);
         }
     }
 
     ChannelFinderClientImpl(URI uri, ClientConfig config, HTTPBasicAuthFilter httpBasicAuthFilter,
             ExecutorService executor) {
         Client client = Client.create(config);
+        client.setFollowRedirects(true);
         cfResource = client.resource(uri.toString());
+        cfAuthenticatedResource = client.resource(uri.toString());
         if (httpBasicAuthFilter != null) {
-            client.addFilter(httpBasicAuthFilter);
+            cfAuthenticatedResource.addFilter(httpBasicAuthFilter);
         }
         // TODO add a preference to add logging
-//        client.addFilter(new RawLoggingFilter(Logger.getLogger(RawLoggingFilter.class.getName())));
-        client.setFollowRedirects(true);
-        cfAuthenticatedResource = client.resource(uri.toString());
+        if(Boolean.parseBoolean(properties.getPreferenceValue("rawFiltering"))) {
+            client.addFilter(new RawLoggingFilter(Logger.getLogger(RawLoggingFilter.class.getName())));
+        }
         this.executor = executor;
     }
 

diff --git a/app/channel/channelfinder/src/main/resources/channelfinder_preferences.properties b/app/channel/channelfinder/src/main/resources/channelfinder_preferences.properties
@@ -4,4 +4,6 @@
 
 serviceURL=http://localhost:8080/ChannelFinder
 username=admin
-password=adminPass
+password=adminPass
+
+rawFiltering=false