Merge pull request #775 from ixcat/issue-668

datajoint/admin.py: add order_by argument to dj.kill (#668)

Author: eywalker

datajoint/admin.py

@@ -21,11 +21,12 @@ def set_password(new_password=None, connection=None, update_config=None):   # pr
         config.save_local(verbose=True)
 
 
-def kill(restriction=None, connection=None):  # pragma: no cover
+def kill(restriction=None, connection=None, order_by=None):  # pragma: no cover
     """
     view and kill database connections.
     :param restriction: restriction to be applied to processlist
     :param connection: a datajoint.Connection object. Default calls datajoint.conn()
+    :param order_by: order by string clause for output ordering. defaults to 'id'.
 
     Restrictions are specified as strings and can involve any of the attributes of
     information_schema.processlist: ID, USER, HOST, DB, COMMAND, TIME, STATE, INFO.
@@ -39,7 +40,8 @@ def kill(restriction=None, connection=None):  # pragma: no cover
         connection = conn()
 
     query = 'SELECT * FROM information_schema.processlist WHERE id <> CONNECTION_ID()' + (
-        "" if restriction is None else ' AND (%s)' % restriction)
+        "" if restriction is None else ' AND (%s)' % restriction) + (
+            ' ORDER BY %s' % (order_by or 'id'))
 
     while True:
         print('  ID USER         HOST          STATE         TIME    INFO')

docs-parts/computation/06-distributed-computing_kill_order_by.rst

@@ -0,0 +1,14 @@
+
+For example, to sort the output by hostname in descending order:
+
+.. code-block:: text
+
+    In [3]: dj.kill(None, None, 'host desc')
+    Out[3]:
+      ID USER         HOST          STATE         TIME    INFO
+    +--+ +----------+ +-----------+ +-----------+ +-----+
+      33 chris        localhost:54840                 1261  None
+      17 chris        localhost:54587                 3246  None
+       4 event_scheduler localhost    Waiting on empty queue  187180  None
+    process to kill or "q" to quit > q
+