From 14a968b499075805d7d9fd2fb42f784d413cb55b Mon Sep 17 00:00:00 2001
From: Jonathan Warren <me@jonwarren.org>
Date: Sun, 25 Aug 2013 22:52:38 -0400
Subject: [PATCH] github demanded a manual merge

---
 src/bitmessagemain.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py
index bc884121..662ca7a6 100755
--- a/src/bitmessagemain.py
+++ b/src/bitmessagemain.py
@@ -875,8 +875,8 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
         except APIError as e:
             return str(e)
         except Exception as e:
-            print(e)
-            print(sys.exc_info()[0])
+            logger.critical(e)
+            logger.critical(sys.exc_info()[0])
             return "API Error 0021: Unexpected API Failure - %s" % str(e)
 
 # This thread, of which there is only one, runs the API.
@@ -988,7 +988,6 @@ class Main:
     def getApiAddress(self):
         if not shared.safeConfigGetBoolean('bitmessagesettings', 'apienabled'):
             return None
-            
         address = shared.config.get('bitmessagesettings', 'apiinterface')
         port = shared.config.getint('bitmessagesettings', 'apiport')
         return {'address':address,'port':port}