##// END OF EJS Templates
Merge pull request #5700 from minrk/configurable-managers...
Thomas Kluyver -
r16464:e584367a merge
parent child Browse files
Show More
@@ -495,7 +495,20 b' class NotebookApp(BaseIPythonApplication):'
495
495
496 notebook_manager_class = DottedObjectName('IPython.html.services.notebooks.filenbmanager.FileNotebookManager',
496 notebook_manager_class = DottedObjectName('IPython.html.services.notebooks.filenbmanager.FileNotebookManager',
497 config=True,
497 config=True,
498 help='The notebook manager class to use.')
498 help='The notebook manager class to use.'
499 )
500 kernel_manager_class = DottedObjectName('IPython.html.services.kernels.kernelmanager.MappingKernelManager',
501 config=True,
502 help='The kernel manager class to use.'
503 )
504 session_manager_class = DottedObjectName('IPython.html.services.sessions.sessionmanager.SessionManager',
505 config=True,
506 help='The session manager class to use.'
507 )
508 cluster_manager_class = DottedObjectName('IPython.html.services.clusters.clustermanager.ClusterManager',
509 config=True,
510 help='The cluster manager class to use.'
511 )
499
512
500 trust_xheaders = Bool(False, config=True,
513 trust_xheaders = Bool(False, config=True,
501 help=("Whether to trust or not X-Scheme/X-Forwarded-Proto and X-Real-Ip/X-Forwarded-For headers"
514 help=("Whether to trust or not X-Scheme/X-Forwarded-Proto and X-Real-Ip/X-Forwarded-For headers"
@@ -574,14 +587,17 b' class NotebookApp(BaseIPythonApplication):'
574 def init_configurables(self):
587 def init_configurables(self):
575 # force Session default to be secure
588 # force Session default to be secure
576 default_secure(self.config)
589 default_secure(self.config)
577 self.kernel_manager = MappingKernelManager(
590 kls = import_item(self.kernel_manager_class)
591 self.kernel_manager = kls(
578 parent=self, log=self.log, kernel_argv=self.kernel_argv,
592 parent=self, log=self.log, kernel_argv=self.kernel_argv,
579 connection_dir = self.profile_dir.security_dir,
593 connection_dir = self.profile_dir.security_dir,
580 )
594 )
581 kls = import_item(self.notebook_manager_class)
595 kls = import_item(self.notebook_manager_class)
582 self.notebook_manager = kls(parent=self, log=self.log)
596 self.notebook_manager = kls(parent=self, log=self.log)
583 self.session_manager = SessionManager(parent=self, log=self.log)
597 kls = import_item(self.session_manager_class)
584 self.cluster_manager = ClusterManager(parent=self, log=self.log)
598 self.session_manager = kls(parent=self, log=self.log)
599 kls = import_item(self.cluster_manager_class)
600 self.cluster_manager = kls(parent=self, log=self.log)
585 self.cluster_manager.update_profiles()
601 self.cluster_manager.update_profiles()
586
602
587 def init_logging(self):
603 def init_logging(self):
General Comments 0
You need to be logged in to leave comments. Login now