From 5a1fc32da4b01de4edec55ee5ccb3609902aa050 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Mon, 7 Apr 2014 23:53:52 +0000
Subject: [PATCH] All logging is conditional
---
TODO | 1 -
src/net/i2p/android/router/util/Util.java | 49 +++++++++++++----------
2 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/TODO b/TODO
index 39fde51cc..a8ea00557 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,5 @@
# Required for release
-- Ensure all logging is conditional
- Prevent accidental shutdown
- Add pop-up confirming router shutdown
- OR: make router button long-press
diff --git a/src/net/i2p/android/router/util/Util.java b/src/net/i2p/android/router/util/Util.java
index 1902f9e34..9a190fefa 100644
--- a/src/net/i2p/android/router/util/Util.java
+++ b/src/net/i2p/android/router/util/Util.java
@@ -7,7 +7,6 @@ import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.os.Build;
import net.i2p.I2PAppContext;
-import net.i2p.util.Log;
public abstract class Util {
private static final boolean _isEmulator = Build.MODEL.equals("sdk");
@@ -54,11 +53,13 @@ public abstract class Util {
public static void e(String m, Throwable t) {
I2PAppContext ctx = I2PAppContext.getCurrentContext();
if (ctx != null)
- ctx.logManager().getLog(Util.class).log(Log.ERROR, m, t);
- else if (t != null)
- android.util.Log.e(ANDROID_TAG, m + ' ' + t + ' ' + android.util.Log.getStackTraceString(t));
- else
- android.util.Log.e(ANDROID_TAG, m);
+ ctx.logManager().getLog(Util.class).error(m, t);
+ else if (android.util.Log.isLoggable(ANDROID_TAG, android.util.Log.ERROR)) {
+ if (t != null)
+ android.util.Log.e(ANDROID_TAG, m + ' ' + t + ' ' + android.util.Log.getStackTraceString(t));
+ else
+ android.util.Log.e(ANDROID_TAG, m);
+ }
}
public static void w(String m) {
@@ -68,11 +69,13 @@ public abstract class Util {
public static void w(String m, Throwable t) {
I2PAppContext ctx = I2PAppContext.getCurrentContext();
if (ctx != null)
- ctx.logManager().getLog(Util.class).log(Log.WARN, m, t);
- else if (t != null)
- android.util.Log.w(ANDROID_TAG, m + ' ' + t + ' ' + android.util.Log.getStackTraceString(t));
- else
- android.util.Log.w(ANDROID_TAG, m);
+ ctx.logManager().getLog(Util.class).warn(m, t);
+ else if (android.util.Log.isLoggable(ANDROID_TAG, android.util.Log.WARN)) {
+ if (t != null)
+ android.util.Log.w(ANDROID_TAG, m + ' ' + t + ' ' + android.util.Log.getStackTraceString(t));
+ else
+ android.util.Log.w(ANDROID_TAG, m);
+ }
}
public static void i(String m) {
@@ -82,11 +85,13 @@ public abstract class Util {
public static void i(String m, Throwable t) {
I2PAppContext ctx = I2PAppContext.getCurrentContext();
if (ctx != null)
- ctx.logManager().getLog(Util.class).log(Log.INFO, m, t);
- else if (t != null)
- android.util.Log.i(ANDROID_TAG, m + ' ' + t + ' ' + android.util.Log.getStackTraceString(t));
- else
- android.util.Log.i(ANDROID_TAG, m);
+ ctx.logManager().getLog(Util.class).info(m, t);
+ else if (android.util.Log.isLoggable(ANDROID_TAG, android.util.Log.INFO)) {
+ if (t != null)
+ android.util.Log.i(ANDROID_TAG, m + ' ' + t + ' ' + android.util.Log.getStackTraceString(t));
+ else
+ android.util.Log.i(ANDROID_TAG, m);
+ }
}
public static void d(String m) {
d(m, null);
@@ -95,10 +100,12 @@ public abstract class Util {
public static void d(String m, Throwable t) {
I2PAppContext ctx = I2PAppContext.getCurrentContext();
if (ctx != null)
- ctx.logManager().getLog(Util.class).log(Log.DEBUG, m, t);
- else if (t != null)
- android.util.Log.d(ANDROID_TAG, m + ' ' + t + ' ' + android.util.Log.getStackTraceString(t));
- else
- android.util.Log.d(ANDROID_TAG, m);
+ ctx.logManager().getLog(Util.class).debug(m, t);
+ else if (android.util.Log.isLoggable(ANDROID_TAG, android.util.Log.DEBUG)) {
+ if (t != null)
+ android.util.Log.d(ANDROID_TAG, m + ' ' + t + ' ' + android.util.Log.getStackTraceString(t));
+ else
+ android.util.Log.d(ANDROID_TAG, m);
+ }
}
}
--
GitLab