##// END OF EJS Templates
Merge pull request #3560 from minrk/longcell...
Min RK -
r11273:ced013fe merge
parent child Browse files
Show More
@@ -174,7 +174,6 b' class NotebookWebApplication(web.Application):'
174
174
175 # IPython stuff
175 # IPython stuff
176 mathjax_url=ipython_app.mathjax_url,
176 mathjax_url=ipython_app.mathjax_url,
177 max_msg_size=ipython_app.max_msg_size,
178 config=ipython_app.config,
177 config=ipython_app.config,
179 use_less=ipython_app.use_less,
178 use_less=ipython_app.use_less,
180 jinja2_env=Environment(loader=FileSystemLoader(template_path)),
179 jinja2_env=Environment(loader=FileSystemLoader(template_path)),
@@ -295,11 +294,6 b' class NotebookApp(BaseIPythonApplication):'
295
294
296 kernel_argv = List(Unicode)
295 kernel_argv = List(Unicode)
297
296
298 max_msg_size = Integer(65536, config=True, help="""
299 The max raw message size accepted from the browser
300 over a WebSocket connection.
301 """)
302
303 def _log_level_default(self):
297 def _log_level_default(self):
304 return logging.INFO
298 return logging.INFO
305
299
@@ -79,10 +79,6 b' class KernelActionHandler(IPythonHandler):'
79
79
80 class ZMQChannelHandler(AuthenticatedZMQStreamHandler):
80 class ZMQChannelHandler(AuthenticatedZMQStreamHandler):
81
81
82 @property
83 def max_msg_size(self):
84 return self.settings.get('max_msg_size', 65535)
85
86 def create_stream(self):
82 def create_stream(self):
87 km = self.kernel_manager
83 km = self.kernel_manager
88 meth = getattr(km, 'connect_%s' % self.channel)
84 meth = getattr(km, 'connect_%s' % self.channel)
@@ -109,9 +105,8 b' class ZMQChannelHandler(AuthenticatedZMQStreamHandler):'
109 self.zmq_stream.on_recv(self._on_zmq_reply)
105 self.zmq_stream.on_recv(self._on_zmq_reply)
110
106
111 def on_message(self, msg):
107 def on_message(self, msg):
112 if len(msg) < self.max_msg_size:
108 msg = jsonapi.loads(msg)
113 msg = jsonapi.loads(msg)
109 self.session.send(self.zmq_stream, msg)
114 self.session.send(self.zmq_stream, msg)
115
110
116 def on_close(self):
111 def on_close(self):
117 # This method can be called twice, once by self.kernel_died and once
112 # This method can be called twice, once by self.kernel_died and once
General Comments 0
You need to be logged in to leave comments. Login now