##// END OF EJS Templates
Date is properly removed from JSON reply before WebSocket forward....
Brian E. Granger -
Show More
@@ -101,10 +101,25 b' class ZMQStreamHandler(websocket.WebSocketHandler):'
101 """
101 """
102 idents, msg_list = self.session.feed_identities(msg_list)
102 idents, msg_list = self.session.feed_identities(msg_list)
103 msg = self.session.unserialize(msg_list)
103 msg = self.session.unserialize(msg_list)
104 msg['header'].pop('date')
104 try:
105 msg['header'].pop('date')
106 except KeyError:
107 pass
108 try:
109 msg['parent_header'].pop('date')
110 except KeyError:
111 pass
105 msg.pop('buffers')
112 msg.pop('buffers')
106 return jsonapi.dumps(msg)
113 return jsonapi.dumps(msg)
107
114
115 def _on_zmq_reply(self, msg_list):
116 try:
117 msg = self._reserialize_reply(msg_list)
118 except:
119 self.application.kernel_manager.log.critical("Malformed message: %r" % msg_list)
120 else:
121 self.write_message(msg)
122
108
123
109 class IOPubHandler(ZMQStreamHandler):
124 class IOPubHandler(ZMQStreamHandler):
110
125
@@ -122,10 +137,6 b' class IOPubHandler(ZMQStreamHandler):'
122 self.iopub_stream.on_recv(self._on_zmq_reply)
137 self.iopub_stream.on_recv(self._on_zmq_reply)
123 self.start_hb(self.kernel_died)
138 self.start_hb(self.kernel_died)
124
139
125 def _on_zmq_reply(self, msg_list):
126 msg = self._reserialize_reply(msg_list)
127 self.write_message(msg)
128
129 def on_close(self):
140 def on_close(self):
130 self.stop_hb()
141 self.stop_hb()
131 self.iopub_stream.close()
142 self.iopub_stream.close()
@@ -186,10 +197,6 b' class ShellHandler(ZMQStreamHandler):'
186 self.shell_stream = self.application.kernel_manager.create_shell_stream(kernel_id)
197 self.shell_stream = self.application.kernel_manager.create_shell_stream(kernel_id)
187 self.shell_stream.on_recv(self._on_zmq_reply)
198 self.shell_stream.on_recv(self._on_zmq_reply)
188
199
189 def _on_zmq_reply(self, msg_list):
190 msg = self._reserialize_reply(msg_list)
191 self.write_message(msg)
192
193 def on_message(self, msg):
200 def on_message(self, msg):
194 if len(msg) < self.max_msg_size:
201 if len(msg) < self.max_msg_size:
195 msg = jsonapi.loads(msg)
202 msg = jsonapi.loads(msg)
General Comments 0
You need to be logged in to leave comments. Login now