cleaner error handling

erh · erh · commit 239e4bfe8a77 · 2009-09-25T21:58:43.000-04:00
diff --git a/src/main/com/mongodb/ByteDecoder.java b/src/main/com/mongodb/ByteDecoder.java
@@ -23,7 +23,7 @@
 import java.util.Date;
 import java.util.regex.Pattern;
 import java.nio.ByteBuffer;
-
+import java.util.logging.*;
 
 /** 
  * Deserializes a string from the database into a <code>DBObject</code>.
@@ -129,11 +129,11 @@ private DBObject _create( String path ){
                 return (DBObject)c.newInstance();
             }
             catch ( InstantiationException ie ){
-                ie.printStackTrace();
+                LOGGER.log( Level.FINE , "can't create a: " + c , ie );
                 throw new MongoInternalException( "can't instantiate a : " + c , ie );
             }
             catch ( IllegalAccessException iae ){
-                iae.printStackTrace();
+                LOGGER.log( Level.FINE , "can't create a: " + c , iae );
                 throw new MongoInternalException( "can't instantiate a : " + c , iae );
             }
         }
diff --git a/src/main/com/mongodb/Bytes.java b/src/main/com/mongodb/Bytes.java
@@ -22,14 +22,24 @@
 import java.nio.charset.*;
 import java.util.regex.Pattern;
 import java.util.*;
+import java.util.logging.*;
 
 /**
  * Handles byte functions for <code>ByteEncoder</code> and <code>ByteDecoder</code>.
  */
 public class Bytes {
-
+    
+    static Logger LOGGER = Logger.getLogger( "com.mongodb" );
+    
     static final boolean D = Boolean.getBoolean( "DEBUG.DB" );
 
+    static {
+        if ( D )
+            LOGGER.setLevel( Level.ALL );
+        else
+            LOGGER.setLevel( Level.WARNING );
+    }
+
     /** Little-endian */
     public static final ByteOrder ORDER = ByteOrder.LITTLE_ENDIAN;
     
diff --git a/src/main/com/mongodb/DBApiLayer.java b/src/main/com/mongodb/DBApiLayer.java
@@ -20,6 +20,7 @@
 
 import java.nio.*;
 import java.util.*;
+import java.util.logging.*;
 
 import com.mongodb.util.*;
 
@@ -344,7 +345,7 @@ void _cleanCursors()
                 killCursors( l );
             }
             catch ( Throwable t ){
-                t.printStackTrace();
+                Bytes.LOGGER.log( Level.WARNING , "can't clean cursors" , t );
                 _deadCursorIds.addAll( l );
             }
         }
diff --git a/src/main/com/mongodb/DBPort.java b/src/main/com/mongodb/DBPort.java
@@ -144,8 +144,8 @@ void _open()
             }
             catch ( IOException ioe ){
 //  TODO  - erh to fix                lastError = new IOException( "couldn't connect to [" + _addr + "] bc:" + lastError , lastError );
-                lastError = new IOException( "couldn't connect to [" + _addr + "] bc:" + ioe);
-                _logger.log( Level.SEVERE , "connect fail to : " + _addr , ioe );
+                lastError = new IOException( "couldn't connect to [" + _addr + "] bc:" + ioe , ioe );
+                _logger.log( Level.INFO , "connect fail to : " + _addr , ioe );
             }
             
             if ( _pool != null && ! _pool._everWorked )
@@ -202,5 +202,5 @@ protected void finalize(){
     private SocketChannel _sock;
     
 
-    private static Logger _rootLogger = Logger.getLogger( "db.port" );
+    private static Logger _rootLogger = Logger.getLogger( "com.mongodb.port" );
 }
diff --git a/src/main/com/mongodb/DBPortPool.java b/src/main/com/mongodb/DBPortPool.java
@@ -24,6 +24,7 @@
 import java.net.*;
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.logging.*;
 
 class DBPortPool extends SimplePool<DBPort> {
 
@@ -102,8 +103,7 @@ void gotError( Exception e ){
             return;
         }
 
-        System.out.println( "emptying DBPortPool b/c of error" );
-        e.printStackTrace();
+        Bytes.LOGGER.log( Level.INFO , "emptying DBPortPool b/c of error" , e );
         clear();
     }
 
diff --git a/src/main/com/mongodb/DBTCP.java b/src/main/com/mongodb/DBTCP.java
@@ -26,7 +26,7 @@
 
 public class DBTCP extends DBMessageLayer {
 
-    static Logger _logger = Logger.getLogger( "DBTCP" );
+    static Logger _logger = Logger.getLogger( Bytes.LOGGER.getName() + ".tcp" );
     static Logger _createLogger = Logger.getLogger( _logger.getName() + ".connect" );
 
     public DBTCP( DBAddress addr )

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`import java.util.Date;`
`24`	`24`	`import java.util.regex.Pattern;`
`25`	`25`	`import java.nio.ByteBuffer;`
`26`		`-`
	`26`	`+import java.util.logging.*;`
`27`	`27`
`28`	`28`	`/**`
`29`	`29`	`* Deserializes a string from the database into a <code>DBObject</code>.`
`@@ -129,11 +129,11 @@ private DBObject _create( String path ){`
`129`	`129`	`return (DBObject)c.newInstance();`
`130`	`130`	`}`
`131`	`131`	`catch ( InstantiationException ie ){`
`132`		`- ie.printStackTrace();`
	`132`	`+ LOGGER.log( Level.FINE , "can't create a: " + c , ie );`
`133`	`133`	`throw new MongoInternalException( "can't instantiate a : " + c , ie );`
`134`	`134`	`}`
`135`	`135`	`catch ( IllegalAccessException iae ){`
`136`		`- iae.printStackTrace();`
	`136`	`+ LOGGER.log( Level.FINE , "can't create a: " + c , iae );`
`137`	`137`	`throw new MongoInternalException( "can't instantiate a : " + c , iae );`
`138`	`138`	`}`
`139`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`
`21`	`21`	`import java.nio.*;`
`22`	`22`	`import java.util.*;`
	`23`	`+import java.util.logging.*;`
`23`	`24`
`24`	`25`	`import com.mongodb.util.*;`
`25`	`26`
`@@ -344,7 +345,7 @@ void _cleanCursors()`
`344`	`345`	`killCursors( l );`
`345`	`346`	`}`
`346`	`347`	`catch ( Throwable t ){`
`347`		`- t.printStackTrace();`
	`348`	`+ Bytes.LOGGER.log( Level.WARNING , "can't clean cursors" , t );`
`348`	`349`	`_deadCursorIds.addAll( l );`
`349`	`350`	`}`
`350`	`351`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,8 +144,8 @@ void _open()`
`144`	`144`	`}`
`145`	`145`	`catch ( IOException ioe ){`
`146`	`146`	`// TODO - erh to fix lastError = new IOException( "couldn't connect to [" + _addr + "] bc:" + lastError , lastError );`
`147`		`- lastError = new IOException( "couldn't connect to [" + _addr + "] bc:" + ioe);`
`148`		`- _logger.log( Level.SEVERE , "connect fail to : " + _addr , ioe );`
	`147`	`+ lastError = new IOException( "couldn't connect to [" + _addr + "] bc:" + ioe , ioe );`
	`148`	`+ _logger.log( Level.INFO , "connect fail to : " + _addr , ioe );`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`if ( _pool != null && ! _pool._everWorked )`
`@@ -202,5 +202,5 @@ protected void finalize(){`
`202`	`202`	`private SocketChannel _sock;`
`203`	`203`
`204`	`204`
`205`		`- private static Logger _rootLogger = Logger.getLogger( "db.port" );`
	`205`	`+ private static Logger _rootLogger = Logger.getLogger( "com.mongodb.port" );`
`206`	`206`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`import java.net.*;`
`25`	`25`	`import java.util.*;`
`26`	`26`	`import java.util.concurrent.*;`
	`27`	`+import java.util.logging.*;`
`27`	`28`
`28`	`29`	`class DBPortPool extends SimplePool<DBPort> {`
`29`	`30`
`@@ -102,8 +103,7 @@ void gotError( Exception e ){`
`102`	`103`	`return;`
`103`	`104`	`}`
`104`	`105`
`105`		`- System.out.println( "emptying DBPortPool b/c of error" );`
`106`		`- e.printStackTrace();`
	`106`	`+ Bytes.LOGGER.log( Level.INFO , "emptying DBPortPool b/c of error" , e );`
`107`	`107`	`clear();`
`108`	`108`	`}`
`109`	`109`