Browse Source

Shorten line lengths for recent changes.

pull/197/head
Kelly Truesdale 7 years ago
parent
commit
2c9a29a586
  1. 9
      socketio/asyncio_redis_manager.py
  2. 2
      socketio/base_manager.py
  3. 4
      socketio/kombu_manager.py
  4. 6
      tests/test_pubsub_manager.py

9
socketio/asyncio_redis_manager.py

@ -71,11 +71,13 @@ class AsyncRedisManager(AsyncPubSubManager): # pragma: no cover
pickle.dumps(data)) pickle.dumps(data))
except (aioredis.RedisError, OSError): except (aioredis.RedisError, OSError):
if retry: if retry:
self._get_logger().error('Cannot publish to redis... retrying') self._get_logger().error('Cannot publish to redis... '
'retrying')
self.pub = None self.pub = None
retry = False retry = False
else: else:
self._get_logger().error('Cannot publish to redis... giving up') self._get_logger().error('Cannot publish to redis... '
'giving up')
break break
async def _listen(self): async def _listen(self):
@ -90,7 +92,8 @@ class AsyncRedisManager(AsyncPubSubManager): # pragma: no cover
return await self.ch.get() return await self.ch.get()
except (aioredis.RedisError, OSError): except (aioredis.RedisError, OSError):
self._get_logger().error('Cannot receive from redis... ' self._get_logger().error('Cannot receive from redis... '
'retrying in {} secs'.format(retry_sleep)) 'retrying in '
'{} secs'.format(retry_sleep))
self.sub = None self.sub = None
await asyncio.sleep(retry_sleep) await asyncio.sleep(retry_sleep)
retry_sleep *= 2 retry_sleep *= 2

2
socketio/base_manager.py

@ -165,7 +165,7 @@ class BaseManager(object):
def _get_logger(self): def _get_logger(self):
"""Get the appropriate logger """Get the appropriate logger
Prevents uninitialized servers in write-only mode failing because of a missing logger. Prevents uninitialized servers in write-only mode from failing.
""" """
if self.logger: if self.logger:

4
socketio/kombu_manager.py

@ -43,7 +43,9 @@ class KombuManager(PubSubManager): # pragma: no cover
raise RuntimeError('Kombu package is not installed ' raise RuntimeError('Kombu package is not installed '
'(Run "pip install kombu" in your ' '(Run "pip install kombu" in your '
'virtualenv).') 'virtualenv).')
super(KombuManager, self).__init__(channel=channel, write_only=write_only, logger=logger) super(KombuManager, self).__init__(channel=channel,
write_only=write_only,
logger=logger)
self.url = url self.url = url
self.producer = self._producer() self.producer = self._producer()

6
tests/test_pubsub_manager.py

@ -48,11 +48,13 @@ class TestBaseManager(unittest.TestCase):
self.assertEqual(pm._get_logger(), logging.getLogger('socketio')) self.assertEqual(pm._get_logger(), logging.getLogger('socketio'))
def test_write_only_with_provided_logger(self): def test_write_only_with_provided_logger(self):
pm = pubsub_manager.PubSubManager(write_only=True, logger=logging.getLogger('new_logger')) test_logger = logging.getLogger('new_logger')
pm = pubsub_manager.PubSubManager(write_only=True,
logger=test_logger)
pm.initialize() pm.initialize()
self.assertEqual(pm.channel, 'socketio') self.assertEqual(pm.channel, 'socketio')
self.assertEqual(len(pm.host_id), 32) self.assertEqual(len(pm.host_id), 32)
self.assertEqual(pm._get_logger(), logging.getLogger('new_logger')) self.assertEqual(pm._get_logger(), test_logger)
def test_emit(self): def test_emit(self):
self.pm.emit('foo', 'bar') self.pm.emit('foo', 'bar')

Loading…
Cancel
Save