Merge pull request #74 from Qabel/m/tp

fix leak of redis fildes + monitoring
Qabel · Jan 15, 2017 · e9198f2 · e9198f2
2 parents f503335 + 1c2225e
commit e9198f2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/src/blockserver/backend/pubsub.py b/src/blockserver/backend/pubsub.py
@@ -41,10 +41,12 @@ async def redis(self):
         if not self._redis:
             loop = ioloop.IOLoop.current().asyncio_loop
             self._redis = await aioredis.create_redis((self.host, self.port), loop=loop)
+            monitoring.PUBSUB_OPEN_CONNECTIONS.inc()
         return self._redis
 
     async def close(self):
         (await self.redis()).close()
+        monitoring.PUBSUB_OPEN_CONNECTIONS.dec()
 
     async def subscribe(self, channel, wildcard=False):
         if wildcard:

diff --git a/src/blockserver/monitoring.py b/src/blockserver/monitoring.py
@@ -55,6 +55,9 @@
 PUBSUB_PUBLISHED = Counter('pubsub_published',
                            'Messages published via pubsub')
 
+PUBSUB_OPEN_CONNECTIONS = Gauge('pubsub_connections',
+                                'Open connections to the pubsub broker (normally redis)')
+
 
 def time(metric):
     @asyncio.coroutine

diff --git a/src/blockserver/server.py b/src/blockserver/server.py
@@ -295,6 +295,7 @@ def delete(self, prefix, file_path):
             'prefix': prefix,
             'path': path,
         })
+        yield pubsub.close()
         self.finish()
 
     def on_finish(self):