store last_activity in the database

fetch it periodically (10 minutes) from the proxy
and display it on the admin page

jupyterhub/app.py

@@ -8,6 +8,7 @@ import getpass
 import io
 import logging
 import os
+from datetime import datetime
 from subprocess import Popen
 
 try:
@@ -36,8 +37,10 @@ from . import handlers, apihandlers
 
 from . import orm
 from ._data import DATA_FILES_PATH
-from .utils import url_path_join, random_hex, TimeoutError
-
+from .utils import (
+    url_path_join, random_hex, TimeoutError,
+    ISO8601_ms, ISO8601_s,
+)
 # classes for config
 from .auth import Authenticator, PAMAuthenticator
 from .spawner import Spawner, LocalProcessSpawner
@@ -111,7 +114,10 @@ class JupyterHubApp(Application):
         Useful for daemonizing jupyterhub.
         """
     )
-    proxy_check_interval = Integer(10, config=True,
+    last_activity_interval = Integer(600, config=True,
+        help="Interval (in seconds) at which to update last-activity timestamps."
+    )
+    proxy_check_interval = Integer(30, config=True,
         help="Interval (in seconds) at which to check if the proxy is running."
     )
     
@@ -641,6 +647,23 @@ class JupyterHubApp(Application):
         with io.open(self.config_file, encoding='utf8', mode='w') as f:
             f.write(config_text)
     
+    @gen.coroutine
+    def update_last_activity(self):
+        """Update User.last_activity timestamps from the proxy"""
+        routes = yield self.proxy.fetch_routes()
+        for prefix, route in routes.items():
+            user = orm.User.find(self.db, route.get('user'))
+            if user is None:
+                self.log.warn("Found no user for route: %s", route)
+                continue
+            try:
+                dt = datetime.strptime(route['last_activity'], ISO8601_ms)
+            except Exception:
+                dt = datetime.strptime(route['last_activity'], ISO8601_s)
+            user.last_activity = max(user.last_activity, dt)
+
+        self.db.commit()
+
     def start(self):
         """Start the whole thing"""
         if self.generate_config:
@@ -664,6 +687,10 @@ class JupyterHubApp(Application):
             pc = PeriodicCallback(self.check_proxy, 1e3 * self.proxy_check_interval)
             pc.start()
         
+        if self.last_activity_interval:
+            pc = PeriodicCallback(self.update_last_activity, 1e3 * self.last_activity_interval)
+            pc.start()
+
         # start the webserver
         http_server = tornado.httpserver.HTTPServer(self.tornado_application)
         http_server.listen(self.hub_port)

jupyterhub/utils.py

@@ -28,6 +28,10 @@ def random_port():
     sock.close()
     return port
 
+# ISO8601 for strptime with/without milliseconds
+ISO8601_ms = '%Y-%m-%dT%H:%M:%S.%fZ'
+ISO8601_s = '%Y-%m-%dT%H:%M:%SZ'
+
 def random_hex(nbytes):
     """Return nbytes random bytes as a unicode hex string
 

share/jupyter/static/js/admin.js

@@ -1,7 +1,7 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-require(["jquery", "bootstrap", "jhapi"], function ($, bs, JHAPI) {
+require(["jquery", "bootstrap", "moment", "jhapi"], function ($, bs, moment, JHAPI) {
     "use strict";
     
     var base_url = window.jhdata.base_url;
@@ -14,6 +14,12 @@ require(["jquery", "bootstrap", "jhapi"], function ($, bs, JHAPI) {
         return element;
     };
     
+    $(".time-col").map(function (i, el) {
+        // convert ISO datestamps to nice momentjs ones
+        el = $(el);
+        el.text(moment(new Date(el.text())).fromNow());
+    });
+    
     $(".stop-server").click(function () {
         var el = $(this);
         var row = get_row(el);

share/jupyter/templates/admin.html

@@ -6,14 +6,16 @@
   <table class="table table-striped">
     <thead>
       <tr>
-        <th colspan="4">Users</th>
+        <th colspan="2">User</th>
+        <th colspan="3">Last Seen</th>
       </tr>
     </thead>
     <tbody>
   {% for u in users %}
     <tr class="user-row" data-user="{{u.name}}" data-admin="{{u.admin}}">
-      <td class="name-col col-sm-4">{{u.name}}</td>
-      <td class="admin-col col-sm-4">{% if u.admin %}admin{% endif %}</td>
+      <td class="name-col col-sm-2">{{u.name}}</td>
+      <td class="admin-col col-sm-2">{% if u.admin %}admin{% endif %}</td>
+      <td class="time-col col-sm-4">{{u.last_activity.isoformat() + 'Z'}}</td>
       <td class="server-col col-sm-2 text-center">
       {% if u.server %}
         <span class="stop-server btn btn-xs btn-danger">stop server</span>
@@ -30,8 +32,8 @@
     </tr>
   {% endfor %}
     <tr class="user-row add-user-row">
-      <td colspan="4">
-        <a id="add-user" class="col-xs-12 btn btn-primary">Add User</a>
+      <td colspan="5">
+        <a id="add-user" class="col-xs-12 btn btn-default">Add User</a>
       </td>
     </tr>
   </tbody>