Merge pull request #38 from flipkart-incubator/logging

Enable/disable logging support
flipkart-incubator · Aug 10, 2016 · 8350838 · 8350838
2 parents a65a313 + 1a5a99a
commit 8350838
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 6 deletions.
diff --git a/library/src/main/java/com/flipkart/okhttpstats/NetworkInterceptor.java b/library/src/main/java/com/flipkart/okhttpstats/NetworkInterceptor.java
@@ -24,6 +24,7 @@
 package com.flipkart.okhttpstats;
 
 import com.flipkart.okhttpstats.interpreter.NetworkInterpreter;
+import com.flipkart.okhttpstats.toolbox.Utils;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -49,6 +50,7 @@ private NetworkInterceptor(Builder builder) {
             throw new IllegalStateException("NetworkInterpreter cannot be null");
         }
         mInterpreter = builder.mInterpreter;
+        Utils.setIsLoggingEnabled(builder.mIsLoggingEnabled);
     }
 
     /**
@@ -94,6 +96,7 @@ public static class TimeInfo {
      */
     public static class Builder {
         private boolean mEnabled = true;
+        private boolean mIsLoggingEnabled = false;
         private NetworkInterpreter mInterpreter;
 
         /**
@@ -119,6 +122,17 @@ public Builder setNetworkInterpreter(NetworkInterpreter interpreter) {
             return this;
         }
 
+        /**
+         * To enable/disable logging. By default logging is disabled.
+         *
+         * @param isLoggingEnabled : boolean
+         * @return {@link Builder}
+         */
+        public Builder setLoggingEnabled(boolean isLoggingEnabled) {
+            this.mIsLoggingEnabled = isLoggingEnabled;
+            return this;
+        }
+
         public NetworkInterceptor build() {
             return new NetworkInterceptor(this);
         }

diff --git a/library/src/main/java/com/flipkart/okhttpstats/handler/PersistentStatsHandler.java b/library/src/main/java/com/flipkart/okhttpstats/handler/PersistentStatsHandler.java
@@ -34,6 +34,7 @@
 import com.flipkart.okhttpstats.model.RequestStats;
 import com.flipkart.okhttpstats.toolbox.NetworkStat;
 import com.flipkart.okhttpstats.toolbox.PreferenceManager;
+import com.flipkart.okhttpstats.toolbox.Utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -146,7 +147,7 @@ public float getAverageNetworkSpeed() {
 
     @Override
     public void onResponseReceived(final RequestStats requestStats) {
-        if (mLogger.isDebugEnabled()) {
+        if (Utils.isLoggingEnabled()) {
             mLogger.debug("Response Received : {}", requestStats);
         }
 
@@ -178,7 +179,7 @@ private float calculateNewSpeed(float currentAvgSpeed) {
 
     @Override
     public void onHttpExchangeError(RequestStats requestStats, IOException e) {
-        if (mLogger.isDebugEnabled()) {
+        if (Utils.isLoggingEnabled()) {
             mLogger.debug("Response Received With Http Exchange Error : {}", requestStats);
         }
 
@@ -191,7 +192,7 @@ public void onHttpExchangeError(RequestStats requestStats, IOException e) {
 
     @Override
     public void onResponseInputStreamError(RequestStats requestStats, Exception e) {
-        if (mLogger.isDebugEnabled()) {
+        if (Utils.isLoggingEnabled()) {
             mLogger.debug("Response Received With InputStream Error : {}", requestStats);
         }
 
@@ -208,7 +209,7 @@ public void onResponseInputStreamError(RequestStats requestStats, Exception e) {
      * @param currentAvgSpeed : float
      */
     private void saveToSharedPreference(float currentAvgSpeed) {
-        if (mLogger.isDebugEnabled()) {
+        if (Utils.isLoggingEnabled()) {
             mLogger.debug("avg speed", "saveToSharedPreference: " + mNetworkStat.getCurrentAvgSpeed());
         }
         String networkKey = getNetworkKey(getActiveNetworkInfo());

diff --git a/library/src/main/java/com/flipkart/okhttpstats/interpreter/DefaultInterpreter.java b/library/src/main/java/com/flipkart/okhttpstats/interpreter/DefaultInterpreter.java
@@ -71,7 +71,7 @@ public Response interpretResponseStream(int requestId, NetworkInterceptor.TimeIn
                 try {
                     responseStream = body.byteStream();
                 } catch (Exception e) {
-                    if (logger.isDebugEnabled()) {
+                    if (Utils.isLoggingEnabled()) {
                         logger.debug("Error received while reading input stream {}", e.getMessage());
                     }
 
@@ -101,7 +101,7 @@ public void onEOF(long bytesRead) {
 
     @Override
     public void interpretError(int requestId, NetworkInterceptor.TimeInfo timeInfo, Request request, IOException e) {
-        if (logger.isDebugEnabled()) {
+        if (Utils.isLoggingEnabled()) {
             logger.debug("Error received while proceeding response {}", e.getMessage());
         }
         final OkHttpInspectorRequest okHttpInspectorRequest = new OkHttpInspectorRequest(requestId, request.url().url(), request.method(), Utils.contentLength(request), request.header(HOST_NAME));

diff --git a/library/src/main/java/com/flipkart/okhttpstats/toolbox/Utils.java b/library/src/main/java/com/flipkart/okhttpstats/toolbox/Utils.java
@@ -29,6 +29,16 @@
 
 public class Utils {
 
+    private static boolean isLoggingEnabled = false;
+
+    public static boolean isLoggingEnabled() {
+        return isLoggingEnabled;
+    }
+
+    public static void setIsLoggingEnabled(boolean isLoggingEnabled) {
+        Utils.isLoggingEnabled = isLoggingEnabled;
+    }
+
     public static long contentLength(Request request) {
         return contentLength(request.headers());
     }