Adjust logging

eclipse-pass · Mar 7, 2018 · 1424cef · 1424cef
1 parent 39cb06e
commit 1424cef
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 25 deletions.
diff --git a/...lters/src/main/java/org/dataconservancy/fcrepo/jsonld/compact/CompactingOutputStream.java b/...lters/src/main/java/org/dataconservancy/fcrepo/jsonld/compact/CompactingOutputStream.java
@@ -75,7 +75,7 @@ public void write(int b) throws IOException {
      * Tell the compactor to do JSON-LD compaction when it starts getting input.
      */
     public void enableCompaction() {
-        LOG.info("Enabling compaction");
+        LOG.debug("Enabling compaction");
         this.compactionEnabled = true;
     }
 
@@ -84,12 +84,12 @@ public void close() throws IOException {
 
         try {
             if (compactionEnabled && context != null) {
-                LOG.info("Doing compaction and writing to {}, which is a {}", super.out, super.out.getClass());
+                LOG.debug("Doing compaction and writing to {}, which is a {}", super.out, super.out.getClass());
                 final String compacted = compactor.compact(new String(captured.toByteArray(), UTF_8), context);
-                LOG.info("Writing compacted jsonld: {}", compacted);
+                LOG.debug("Writing compacted jsonld: {}", compacted);
                 super.out.write(compacted.getBytes(UTF_8));
             } else {
-                LOG.info("Not doing compaction");
+                LOG.debug("Not doing compaction");
             }
         } catch (final Exception e) {
             throw new RuntimeException("Could not compact jsonld", e);

diff --git a/...don-filters/src/main/java/org/dataconservancy/fcrepo/jsonld/compact/CompactionFilter.java b/...don-filters/src/main/java/org/dataconservancy/fcrepo/jsonld/compact/CompactionFilter.java
@@ -55,7 +55,7 @@ public class CompactionFilter implements Filter {
     @Override
     public void init(FilterConfig filterConfig) throws ServletException {
 
-        LOG.warn("Initialized compaction filter");
+        LOG.info("Initializing compaction filter");
 
         final String context = Optional.ofNullable(filterConfig.getInitParameter("context")).orElse(getValue(
                 CONTEXT_COMPACTION_URI_PROP));
@@ -82,9 +82,9 @@ public void init(FilterConfig filterConfig) throws ServletException {
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
             ServletException {
 
-        LOG.warn("Servicing response");
+        LOG.debug("Servicing response");
 
-        LOG.info("Initial Output Stream: " + response.getOutputStream());
+        LOG.debug("Initial Output Stream: " + response.getOutputStream());
         final CompactionWrapper compactionWrapper = new CompactionWrapper((HttpServletResponse) response, compactor,
                 defaultContext);
         chain.doFilter(request, compactionWrapper);

diff --git a/...on-filters/src/main/java/org/dataconservancy/fcrepo/jsonld/compact/CompactionWrapper.java b/...on-filters/src/main/java/org/dataconservancy/fcrepo/jsonld/compact/CompactionWrapper.java
@@ -46,7 +46,7 @@ public CompactionWrapper(HttpServletResponse response, Compactor compactor, URL
 
         try {
             delegate = super.getOutputStream();
-            LOG.info("Delegate output stream is " + delegate);
+            LOG.debug("Delegate output stream is " + delegate);
             compactingOutputStream = new CompactingOutputStream(delegate, compactor, context);
         } catch (final IOException e) {
             throw new RuntimeException("Could not open response output stream", e);
@@ -74,7 +74,7 @@ public boolean isReady() {
 
             @Override
             public void close() throws IOException {
-                LOG.info("Closing compacting output stream");
+                LOG.debug("Closing compacting output stream");
                 compactingOutputStream.close();
             }
         };
@@ -92,25 +92,15 @@ public PrintWriter getWriter() throws IOException {
 
     @Override
     public void addHeader(String name, String value) {
-        LOG.info("addHeader {} = {}", name, value);
-
-        if (!name.equalsIgnoreCase("Length")) {
-            super.setHeader(name, value);
-        }
-
+        super.addHeader(name, value);
         if (name.equalsIgnoreCase("content-type") && value.startsWith(JSON_LD_MEDIA_TYPE)) {
             compactingOutputStream.enableCompaction();
         }
     }
 
     @Override
     public void setHeader(String name, String value) {
-        LOG.info("setHeader {} = {}", name, value);
-
-        if (!name.equalsIgnoreCase("Length")) {
-            super.setHeader(name, value);
-        }
-
+        super.addHeader(name, value);
         if (name.equalsIgnoreCase("content-type") && value.startsWith(JSON_LD_MEDIA_TYPE)) {
             compactingOutputStream.enableCompaction();
         }

diff --git a/jsonld-addon-filters/src/main/java/org/dataconservancy/fcrepo/jsonld/compact/ConfigUtil.java b/jsonld-addon-filters/src/main/java/org/dataconservancy/fcrepo/jsonld/compact/ConfigUtil.java
@@ -70,10 +70,6 @@ public static Map<String, String> extract(Stream<String> props, String prefix) {
     }
 
     public static String getValue(String key) {
-        LOG.info("Getting value of '{}'", key);
-        LOG.info("    prop {}: {}", key, System.getProperty(key));
-        LOG.info("    env {}: {}", key, System.getenv(toEnvName(key)));
-
         return System.getProperty(key, System.getenv(toEnvName(key)));
     }