Merge pull request #218 from takluyver/term-server-dir-envvar

Env variables for server root & URL in terminals
jupyter · Jul 21, 2015 · db86515 · db86515
2 parents cc1f01d + a425ed3
commit db86515
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/notebook/notebookapp.py b/notebook/notebookapp.py
@@ -889,7 +889,7 @@ def _url(self, ip):
     def init_terminals(self):
         try:
             from .terminal import initialize
-            initialize(self.web_app)
+            initialize(self.web_app, self.notebook_dir, self.connection_url)
             self.web_app.settings['terminals_available'] = True
         except ImportError as e:
             log = self.log.debug if sys.platform == 'win32' else self.log.warn

diff --git a/notebook/terminal/__init__.py b/notebook/terminal/__init__.py
@@ -12,9 +12,14 @@
 from .handlers import TerminalHandler, TermSocket
 from . import api_handlers
 
-def initialize(webapp):
+def initialize(webapp, notebook_dir, connection_url):
     shell = os.environ.get('SHELL') or 'sh'
-    terminal_manager = webapp.settings['terminal_manager'] = NamedTermManager(shell_command=[shell])
+    terminal_manager = webapp.settings['terminal_manager'] = NamedTermManager(
+        shell_command=[shell],
+        extra_env={'JUPYTER_SERVER_ROOT': notebook_dir,
+                   'JUPYTER_SERVER_URL': connection_url,
+                   },
+    )
     terminal_manager.log = app_log
     base_url = webapp.settings['base_url']
     handlers = [
@@ -24,4 +29,4 @@ def initialize(webapp):
         (ujoin(base_url, r"/api/terminals"), api_handlers.TerminalRootHandler),
         (ujoin(base_url, r"/api/terminals/(\w+)"), api_handlers.TerminalHandler),
     ]
-    webapp.add_handlers(".*$", handlers)
+    webapp.add_handlers(".*$", handlers)