From daa3e224a3a3d25d6cd55b2416e9c236c1b4f59d Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Wed, 17 Sep 2014 14:46:57 +0200
Subject: Fix logging in brain.py

---
 client/brain.py | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/client/brain.py b/client/brain.py
index a1fdea4..f197bc4 100644
--- a/client/brain.py
+++ b/client/brain.py
@@ -5,17 +5,6 @@ import pkgutil
 import importlib
 import jasperpath
 
-
-def logError():
-    logger = logging.getLogger('jasper')
-    fh = logging.FileHandler('jasper.log')
-    fh.setLevel(logging.WARNING)
-    formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
-    fh.setFormatter(formatter)
-    logger.addHandler(fh)
-    logger.error('Failed to execute module', exc_info=True)
-
-
 class Brain(object):
 
     def __init__(self, mic, profile):
@@ -33,6 +22,7 @@ class Brain(object):
         self.mic = mic
         self.profile = profile
         self.modules = self.get_modules()
+        self._logger = logging.getLogger(__name__)
 
     @classmethod
     def get_modules(cls):
@@ -67,7 +57,7 @@ class Brain(object):
                     module.handle(text, self.mic, self.profile)
                     break
                 except:
-                    logError()
+                    self._logger.error('Failed to execute module', exc_info=True)
                     self.mic.say(
                         "I'm sorry. I had some trouble with that operation. Please try again later.")
                     break
-- 
cgit v1.3.1


From 3468543f0e528115bc28540092d1670c1163537d Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Wed, 24 Sep 2014 10:52:07 +0200
Subject: Fix brain logging test

---
 client/test.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/test.py b/client/test.py
index 0160b76..184a777 100644
--- a/client/test.py
+++ b/client/test.py
@@ -198,15 +198,15 @@ class TestBrain(unittest.TestCase):
         profile = DEFAULT_PROFILE
         return brain.Brain(mic, profile)
 
-    @patch.object(brain, 'logError')
-    def testLog(self, logError):
+    def testLog(self):
         """Does Brain correctly log errors when raised by modules?"""
         my_brain = TestBrain._emptyBrain()
         unclear = my_brain.modules[-1]
         with patch.object(unclear, 'handle') as mocked_handle:
-            mocked_handle.side_effect = KeyError('foo')
-            my_brain.query("zzz gibberish zzz")
-            logError.assert_called_with()
+            with patch.object(my_brain._logger, 'error') as mocked_loggingcall:
+                mocked_handle.side_effect = KeyError('foo')
+                my_brain.query("zzz gibberish zzz")
+                self.assertTrue(mocked_loggingcall.called)
 
     def testSortByPriority(self):
         """Does Brain sort modules by priority?"""
-- 
cgit v1.3.1