From 91b0e0d3f2eaf4f58b82ea6770a27d12d38cbb93 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Thu, 29 Apr 2021 01:55:22 +0200
Subject: [PATCH] more bug fixes
---
python/setup.cfg | 2 +-
python/src/jupyter_remote_spawn/main.py | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/python/setup.cfg b/python/setup.cfg
index aea733c..9ad4a31 100644
--- a/python/setup.cfg
+++ b/python/setup.cfg
@@ -1,6 +1,6 @@
[metadata]
name = rwth-jupyter
-version = 0.0.4
+version = 0.0.6
author = Steffen Vogel
author_email = post@steffenvogel.de
description = Start a RWTHjupyter instance on your machine
diff --git a/python/src/jupyter_remote_spawn/main.py b/python/src/jupyter_remote_spawn/main.py
index c533249..9c6eb3c 100644
--- a/python/src/jupyter_remote_spawn/main.py
+++ b/python/src/jupyter_remote_spawn/main.py
@@ -91,6 +91,9 @@ def main():
chisel_fingerprint = j.get('chisel').get('fingerprint')
jupyter_token = j.get('jupyter').get('token')
+ # Start jupyterhub-singleuser
+ jupyter = JupyterSingleuser(hub.username, jupyter_token, jupyter_notebook_port, jupyter_hub_port)
+
# Establish chisel tunnel
chisel = Chisel(cfg.jupyterhub_url+f'/user/{hub.username}/', [
f'{sftp_port}:localhost:7777',
@@ -106,9 +109,6 @@ def main():
if not chisel.connected.wait(timeout=10):
raise Exception('Failed to connect to chisel server')
- # Start jupyterhub-singleuser
- jupyter = JupyterSingleuser(hub.username, jupyter_token, jupyter_notebook_port, jupyter_hub_port)
-
# Mount RWTHjupyter home directory
if cfg.mount:
if cfg.rwth:
@@ -119,7 +119,7 @@ def main():
cfg.mount_point = f'/tmp/' + getpass.getuser() + '/jupyter'
if not os.path.islink(orig_mount_point):
- os.symlink(orig_mount_point, cfg.mount_point)
+ os.symlink(cfg.mount_point, orig_mount_point)
sshfs = Sshfs(cfg.mount_point, sftp_port)
sshfs.mount()
--
GitLab