Merge pull request #176 from parente/utc-activity

Use UTC times in activity API
jupyter-server · Jun 27, 2016 · 914672f · 914672f
2 parents 059fcf8 + 2ab41e6
commit 914672f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/kernel_gateway/services/kernels/handlers.py b/kernel_gateway/services/kernels/handlers.py
@@ -126,7 +126,7 @@ def open(self, kernel_id):
             Opening a connection to this kernel
         """
         if self.settings.get('kg_list_kernels'):
-            self.activity.publish(self.kernel_id, LAST_CLIENT_CONNECT, datetime.now().isoformat())
+            self.activity.publish(self.kernel_id, LAST_CLIENT_CONNECT, datetime.utcnow().isoformat())
             self.activity.increment_activity(self.kernel_id, CONNECTIONS)
         super(ZMQChannelsHandler, self).open(kernel_id)
 
@@ -135,7 +135,7 @@ def on_close(self):
         kernel.
         """
         if self.settings.get('kg_list_kernels'):
-            self.activity.publish(self.kernel_id, LAST_CLIENT_DISCONNECT, datetime.now().isoformat())
+            self.activity.publish(self.kernel_id, LAST_CLIENT_DISCONNECT, datetime.utcnow().isoformat())
             self.activity.decrement_activity(self.kernel_id, CONNECTIONS)
         super(ZMQChannelsHandler, self).on_close()
 
@@ -160,9 +160,9 @@ def _on_zmq_reply(self, stream, msg_list):
                 elif msg_content['execution_state'] == 'idle':
                     self.activity.publish(self.kernel_id, BUSY, False)
                 # Record the time the state was changed
-                self.activity.publish(self.kernel_id, LAST_TIME_STATE_CHANGED, datetime.now().isoformat())
+                self.activity.publish(self.kernel_id, LAST_TIME_STATE_CHANGED, datetime.utcnow().isoformat())
 
-            self.activity.publish(self.kernel_id, LAST_MESSAGE_TO_CLIENT, datetime.now().isoformat())
+            self.activity.publish(self.kernel_id, LAST_MESSAGE_TO_CLIENT, datetime.utcnow().isoformat())
         super(ZMQChannelsHandler, self)._on_zmq_reply(stream, msg_list)
 
     def on_message(self, msg):
@@ -175,7 +175,7 @@ def on_message(self, msg):
             Message sent to a kernel
         """
         if self.settings.get('kg_list_kernels'):
-            self.activity.publish(self.kernel_id, LAST_MESSAGE_TO_KERNEL, datetime.now().isoformat())
+            self.activity.publish(self.kernel_id, LAST_MESSAGE_TO_KERNEL, datetime.utcnow().isoformat())
         super(ZMQChannelsHandler, self).on_message(msg)
 
 default_handlers = []

diff --git a/kernel_gateway/tests/services/activity/test_activity.py b/kernel_gateway/tests/services/activity/test_activity.py
@@ -38,7 +38,7 @@ def test_publish_sets_activity_value(self):
         """publish should set the value for an existing activity"""
         self.activity.publish(self.kernel_id, BUSY, True)
         self.assertEqual(self.activity.get()[self.kernel_id][BUSY], True, 'Kernel activity value was not properly set')
-        time = datetime.now()
+        time = datetime.utcnow()
         self.activity.publish(self.kernel_id, LAST_MESSAGE_TO_KERNEL, time)
         self.assertEqual(self.activity.get()[self.kernel_id][LAST_MESSAGE_TO_KERNEL], time, 'Kernel activity value was not properly set')