Expose connection states in stats api

Author: lordi

syncrypt/api/__init__.py

@@ -1,17 +1,19 @@
+import asyncio
 import json
 import logging
 
-import asyncio
 from aiohttp import web
+
 import syncrypt
 from syncrypt.app.auth import CredentialsAuthenticationProvider
 from syncrypt.backends.base import StorageBackendInvalidAuth
+from syncrypt.backends.binary import get_manager_instance
 
-from .resources import (BundleResource, JSONResponse, VaultResource,
-                        VaultUserResource, UserResource, FlyingVaultResource)
-from .auth import generate_api_auth_token, require_auth_token
 from ..utils.updates import is_update_available
+from .auth import generate_api_auth_token, require_auth_token
 from .client import APIClient
+from .resources import (BundleResource, FlyingVaultResource, JSONResponse,
+                        UserResource, VaultResource, VaultUserResource)
 
 logger = logging.getLogger(__name__)
 
@@ -32,7 +34,8 @@ def get_stats(self, request):
         vault_states = {vault_resource.get_resource_uri(v): v.state for v in self.app.vaults}
         return JSONResponse({
             'stats': self.app.stats,
-            'states': vault_states
+            'states': vault_states,
+            'slots': get_manager_instance().get_stats()
         })
 
     @asyncio.coroutine

syncrypt/backends/binary.py

@@ -728,8 +728,15 @@ def init(self):
                          self.concurrency, id(asyncio.get_event_loop()))
             self.slots = [BinaryStorageConnection(self) for i in range(self.concurrency)]
 
-    def get_active_connection_count(self):
-        return len([conn for conn in self.slots if conn.connected or conn.connecting])
+    def get_stats(self):
+        states = {}
+        if self.slots:
+            for conn in self.slots:
+                states[conn.state] = states.get(conn.state, 0) + 1
+            states['total'] = len(self.slots)
+        else:
+            states['total'] = 0
+        return states
 
     @asyncio.coroutine
     def close(self):
@@ -886,7 +893,8 @@ def init(self):
     def open(self):
         if self.vault and not self.vault.config.get('vault.id'):
             raise VaultNotInitialized()
-        if get_manager_instance().get_active_connection_count() == 0:
+        stats = get_manager_instance().get_stats()
+        if stats['closed'] == stats['total']:
             with (yield from self._acquire_connection()) as conn:
                 self.invalid_auth = False
                 version = yield from conn.version()

tests/test_binary.py

@@ -195,6 +195,7 @@ def test_revision_increase_after_push(self):
         self.assertTrue(not post_rev is None)
 
     def test_take_only_one_connection(self):
+        'this will test if connection slots are properly reused'
         vault = self.vault
 
         app = SyncryptApp(self.app_config)
@@ -206,7 +207,10 @@ def test_take_only_one_connection(self):
         yield from app.get_remote_size_for_vault(vault)
         yield from app.get_remote_size_for_vault(vault)
 
-        self.assertEqual(get_manager_instance().get_active_connection_count(), 1)
+        print(get_manager_instance().get_stats())
+
+        self.assertEqual(get_manager_instance().get_stats()['idle'], 1)
+        self.assertEqual(get_manager_instance().get_stats()['busy'], 0)
 
 if __name__ == '__main__':
     from syncrypt.utils.logging import setup_logging