Add debug messages & location display

Author: blokhin

tests/berlinium/gui_client.py

@@ -12,7 +12,7 @@
 from tilde.core.settings import settings
 
 
-logging.basicConfig(level=logging.INFO)
+logging.basicConfig(level=logging.DEBUG)
 START_TIME = time.time()
 
 class RespHandler(object):
@@ -32,20 +32,20 @@ def on_open(self, ws):
 
     @classmethod
     def on_message(self, ws, message):
-        logging.debug("Received: %s" % message[:100])
+        logging.debug("Received: %s" % message[:200])
         message = json.loads(message)
-    
+
         if message['act'] == 'login':
             ws.send(json.dumps({'act': 'tags', 'req': {}}))
 
         elif message['act'] == 'tags':
             ws.send(json.dumps({'act': 'browse', 'req': {'tids': [2]}}))
 
         elif message['act'] == 'browse':
-            ws.send(json.dumps({'act': 'summary', 'req': {'datahash': 'QZAKBZE26UUMBYJBDDG7XBNYN5IZJJAAW3VI5OJ2CJPXCCI'}}))
+            ws.send(json.dumps({'act': 'summary', 'req': {'datahash': 'UwrPlqexHZjtgKjK4awu4KBxArdSJdwmPq5GShdF9qY7lQPzPDF'}}))
 
         elif message['act'] == 'summary':
-            ws.send(json.dumps({'act': 'estory', 'req': {'datahash': 'OLRUC4GMJKHKOFIEQIDNQBJDII4UH5WQCGQRO5MXD36GSCI'}}))
+            ws.send(json.dumps({'act': 'estory', 'req': {'datahash': '46AISOZQVLHNZZVZ53PPOTHRNHF3JRYYTECKNJ7QNMQXQCI'}}))
 
         elif message['act'] == 'estory':
             logging.info("Client done in: %1.2f sc" % (time.time() - START_TIME))

tilde/berlinium/async_impl.py

@@ -17,7 +17,7 @@
 from tilde.core.settings import settings, connect_database
 
 
-thread_pool = ThreadPoolExecutor(max_workers=5*multiprocessing.cpu_count())
+thread_pool = ThreadPoolExecutor(max_workers=4*multiprocessing.cpu_count())
 
 class Connection(SockJSConnection):
     Type = 'asynchronous'
@@ -52,12 +52,18 @@ def on_message(self, message):
 
         def worker(frame):
             db_session = connect_database(settings, default_actions=False, no_pooling=True)
+            logging.debug("New DB connection to %s" % (
+                settings['db']['default_sqlite_db']
+                if settings['db']['engine'] == 'sqlite'
+                else settings['db']['dbname'] + '@' + settings['db']['engine']
+            ))
 
             frame['result'], frame['error'] = getattr(self.GUIProvider, frame['act'])( frame['req'], frame['client_id'], db_session )
 
             # must explicitly close db connection inside a thread
             db_session.close()
             del db_session
+            logging.debug("DB connection closed")
 
             return frame
 

tilde/berlinium/block_impl.py

@@ -44,7 +44,13 @@ def on_message(self, message):
             frame['error'] = 'No server handler for action: %s' % frame['act']
             return self.respond(frame)
 
-        if not Connection.Clients[frame['client_id']].db: Connection.Clients[frame['client_id']].db = connect_database(settings, default_actions=False, no_pooling=True)
+        if not Connection.Clients[frame['client_id']].db:
+            Connection.Clients[frame['client_id']].db = connect_database(settings, default_actions=False, no_pooling=True)
+            logging.debug("New DB connection to %s" % (
+                settings['db']['default_sqlite_db']
+                if settings['db']['engine'] == 'sqlite'
+                else settings['db']['dbname'] + '@' + settings['db']['engine']
+            ))
 
         frame['result'], frame['error'] = getattr(self.GUIProvider, frame['act'])( frame['req'], frame['client_id'], Connection.Clients[frame['client_id']].db )
         self.respond(frame)
@@ -65,5 +71,6 @@ def on_close(self):
         try:
             self.Clients[client_id].db.close()
             self.Clients[client_id].db = None
+            logging.debug("DB connection closed")
         except: pass
         del self.Clients[client_id]

tilde/berlinium/categs.py

@@ -1,6 +1,9 @@
 
+import os
+
 from tilde.core.common import html_formula, num2name
 
+
 def wrap_cell(entity, json_obj, mapping, table_view=False):
     '''
     Cell wrappers
@@ -35,6 +38,9 @@ def wrap_cell(entity, json_obj, mapping, table_view=False):
     elif entity['source'] == 'dims':
         out = "%4.2f" % json_obj['dims'] if json_obj['periodicity'] in [2, 3] else '—'
 
+    elif entity['source'] == 'location':
+        out = json_obj['location'].split(os.sep)[-1]
+
     else:
         out = num2name(json_obj.get(entity['source']), entity, mapping) or '—'