Added error handling to onThrowable() to protect against exceptions i…

…n error handler. Added enable() method to DebugLogConfig()
charroch · Jun 10, 2011 · 8f4f42d · 8f4f42d
1 parent 9ba6ee9
commit 8f4f42d
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 13 deletions.
diff --git a/RESTProvider/src/novoda/rest/logging/DebugLogConfig.java b/RESTProvider/src/novoda/rest/logging/DebugLogConfig.java
@@ -17,6 +17,7 @@
 
 package novoda.rest.logging;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.logging.Handler;
@@ -98,4 +99,25 @@ public DebugLogConfig(InputStream config) {
         activeHandler.setLevel(Level.ALL);
         rootLogger.addHandler(activeHandler);
     }
+
+    /**
+     * Enables logging
+     *
+     */
+    public static void enable() {
+        try {
+            String config = "org.apache.http.impl.conn.level = FINEST\n"
+                    + "org.apache.http.impl.client.level = FINEST\n"
+                    + "org.apache.http.client.level = FINEST\n" + "org.apache.http.level = FINEST";
+            InputStream in = new ByteArrayInputStream(config.getBytes());
+            LogManager.getLogManager().readConfiguration(in);
+        } catch (IOException e) {
+            Log.w(DebugLogConfig.class.getSimpleName(), "Can't read configuration file for logging");
+        }
+        Logger rootLogger = LogManager.getLogManager().getLogger("");
+        activeHandler = new DalvikLogHandler();
+        activeHandler.setLevel(Level.ALL);
+        rootLogger.addHandler(activeHandler);
+    }
+
 }
diff --git a/RESTProvider/src/novoda/rest/services/HttpService.java b/RESTProvider/src/novoda/rest/services/HttpService.java
@@ -116,19 +116,27 @@ protected void onHandleIntent(Intent intent) {
 	}
 
 	protected void onThrowable(Exception e) {
-		if (Log.isLoggable(TAG, Log.ERROR)) {
-			Log.e(TAG, "an error occured against intent: " + intent);
-			Log.e(TAG, e.getMessage() + "");
-		}
-		if (Log.isLoggable(TAG, Log.DEBUG)) {
-			Log.e(TAG, "full stack trace:", e);
-		}
-
-		if (receiver != null) {
-			final Bundle bundle = new Bundle();
-			bundle.putString(Intent.EXTRA_TEXT, e.toString());
-			receiver.send(STATUS_ERROR, bundle);
-		}
+        try
+        {
+            if (Log.isLoggable(TAG, Log.ERROR)) {
+                Log.e(TAG, "an error occured against intent: " + intent);
+                Log.e(TAG, e.getMessage() + "");
+            }
+            if (Log.isLoggable(TAG, Log.DEBUG)) {
+                Log.e(TAG, "full stack trace:", e);
+            }
+
+            if (receiver != null) {
+                final Bundle bundle = new Bundle();
+                bundle.putString(Intent.EXTRA_TEXT, e.toString());
+                receiver.send(STATUS_ERROR, bundle);
+            }
+        }
+        catch (Exception error)
+        {
+            // Exception thrown in exception handling code - ouch
+            Log.e("TasteCard", "Exception in onThrowable exception handler");
+        }
 	}
 
 	protected HttpUriRequest getHttpUriRequest(Intent intent) {