Merge pull request #32 from pytest-dev/bugfix/20-syslog-error

Workaround errors in SysLogHandler

Author: jaraco

CHANGES.rst

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+2.0.1
+-----
+
+- #20: Added workaround for issue with SysLogHandler.
+
 2.0.0
 -----
 

pytest_services/log.py

@@ -20,12 +20,21 @@ def services_log(slave_id):
             pass
     logger = logging.getLogger('[{slave_id}] {name}'.format(name=__name__, slave_id=slave_id))
     logger.setLevel(logging.DEBUG)
-    if handler:
+    if handler and workaround_issue_20(handler):
         logger.propagate = 0
         logger.addHandler(handler)
     return logger
 
 
+def workaround_issue_20(handler):
+    """
+    Workaround for
+    https://github.com/pytest-dev/pytest-services/issues/20,
+    disabling installation of a broken handler.
+    """
+    return hasattr(handler, 'socket')
+
+
 @contextlib.contextmanager
 def dont_capture(request):
     """Suspend capturing of stdout by pytest."""