Do not fail logging if message is not defined

djmitche · Jun 3, 2016 · 093d0b9 · 093d0b9
1 parent 0c912be
commit 093d0b9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/aiohttp/helpers.py b/aiohttp/helpers.py
@@ -332,7 +332,7 @@ def _format_e(key, args):
 
     @staticmethod
     def _format_i(key, args):
-        return args[0].headers.get(multidict.upstr(key), '-')
+        return args[0].headers.get(multidict.upstr(key), '-') if args[0] else '(no headers)'
 
     @staticmethod
     def _format_o(key, args):

diff --git a/tests/test_helpers.py b/tests/test_helpers.py
@@ -177,9 +177,9 @@ def test_logger_no_message_and_environ():
     mock_logger = mock.Mock()
     mock_transport = mock.Mock()
     mock_transport.get_extra_info.return_value = ("127.0.0.3", 0)
-    access_logger = helpers.AccessLogger(mock_logger, "%r %{FOOBAR}e")
+    access_logger = helpers.AccessLogger(mock_logger, "%r %{FOOBAR}e %{content-type}i")
     access_logger.log(None, None, None, mock_transport, 0.0)
-    mock_logger.info.assert_called_with("- -")
+    mock_logger.info.assert_called_with("- - (no headers)")
 
 
 def test_reify():