Skip to content

Commit 54de032

Browse files
committed
adding key count to redis info
1 parent 0f507a0 commit 54de032

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

HISTORY.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ History
55

66
v0.10.2 (2017-XX-XX)
77
....................
8-
* only save job on task in drain if reenqueing
8+
* only save job on task in drain if re-enqueuing
99
* add semaphore timeout to drains
10+
* add key count to ``log_redis_info``
1011

1112
v0.10.1 (2017-08-16)
1213
....................

arq/utils.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,12 @@ async def get_redis_conn(self):
107107
async def log_redis_info(self, log_func):
108108
pool = await self.get_redis_pool()
109109
async with pool.get() as redis:
110-
info = await redis.info()
110+
info, key_count = await asyncio.gather(redis.info(), redis.dbsize())
111111
log_func(
112112
f'redis version: {info["server"]["redis_version"]}, '
113113
f'mem. usage: {info["memory"]["used_memory_human"]}, '
114-
f'clients connected: {info["clients"]["connected_clients"]}'
114+
f'clients connected: {info["clients"]["connected_clients"]}, '
115+
f'keys in db: {key_count}'
115116
)
116117

117118
async def close(self):

tests/test_utils.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,12 @@ async def test_redis_success_log(loop, caplog):
7575
await pool.wait_closed()
7676

7777

78-
async def test_redis_log(loop, caplog):
78+
async def test_redis_log(loop):
7979
r = RedisMixin(loop=loop)
80+
async with await r.get_redis_conn() as redis:
81+
await redis.flushall()
82+
await redis.set(b'a', b'1')
83+
await redis.set(b'b', b'2')
8084

8185
log_msgs = []
8286

@@ -88,6 +92,7 @@ def _log(s):
8892
print(log_msgs)
8993
assert len(log_msgs) == 1
9094
assert 'redis version: 3.' in log_msgs[0]
95+
assert log_msgs[0].endswith(', clients connected: 1, keys in db: 2')
9196

9297

9398
@pytest.mark.parametrize('previous,expected,kwargs', [

0 commit comments

Comments
 (0)