# HG changeset patch # User osimons # Date 1260358678 0 # Node ID 848bcd96df657b06bbe285273998aeac25cc5426 # Parent 0f5456e9d5da5745a254feb3c2549d66a41886e0 Updating protocol version counter following change in [793] / #459, and also improved errors so that the reason is output on console without verbose logging enabled. Fixes #511. Thanks to Felix Schwarz. diff --git a/bitten/__init__.py b/bitten/__init__.py --- a/bitten/__init__.py +++ b/bitten/__init__.py @@ -19,4 +19,4 @@ pass # The master-slave protocol/configuration version -PROTOCOL_VERSION = 2 +PROTOCOL_VERSION = 3 diff --git a/bitten/slave.py b/bitten/slave.py --- a/bitten/slave.py +++ b/bitten/slave.py @@ -169,9 +169,8 @@ ).startswith('text/plain'): content = e.read() else: - content = 'no message available' - log.debug('Server returned error %d: %s (%s)', - e.code, e.msg, content) + content = 'Unknown cause of error' + e.msg = '%s (%s)' % (e.msg, content) raise return e