From 6da035d71fa9cf12f83bd091c2e9ae995a5e7ea8 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Thu, 29 Apr 2021 02:07:34 +0200
Subject: [PATCH] final fixes for image
---
image/server.py | 7 ++++++-
image/template.html.j2 | 17 ++++++++---------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/image/server.py b/image/server.py
index 6b2b4fe..268a051 100755
--- a/image/server.py
+++ b/image/server.py
@@ -50,6 +50,10 @@ class TemplateRendering:
raise TemplateNotFound(template_name)
return template.render(kwargs)
+class ErrorHandler(RequestHandler, TemplateRendering):
+
+ def get(self):
+ self.set_status(400, 'Singleuser not connected')
class MainHandler(RequestHandler, TemplateRendering):
@@ -160,8 +164,9 @@ def main():
app = Application([
(prefix, MainHandler),
+ (prefix+'api', ErrorHandler),
(prefix+'api/v1', APIHandler),
- (prefix+'.*', RedirectHandler, {'url': prefix})
+ (prefix+'.+', RedirectHandler, {'url': prefix})
])
server = app.listen(8890)
diff --git a/image/template.html.j2 b/image/template.html.j2
index f84b078..3727e56 100644
--- a/image/template.html.j2
+++ b/image/template.html.j2
@@ -2,8 +2,8 @@
<head>
<title>Remote Jupyter Session</title>
<link href="https://cdnjs.cloudflare.com/ajax/libs/prism/1.23.0/themes/prism.css" rel="stylesheet">
- <link rel="stylesheet" href="https://jupyter.rwth-aachen.de/hub/static/css/style.min.css" type="text/css">
- <link rel="stylesheet" href="https://jupyter.rwth-aachen.de/services/announcement/announcement.css">
+ <link href="https://jupyter.rwth-aachen.de/hub/static/css/style.min.css" rel="stylesheet">
+ <link href="https://jupyter.rwth-aachen.de/services/announcement/announcement.css" rel="stylesheet">
<script src="https://jupyter.rwth-aachen.de/hub/static/components/jquery/dist/jquery.min.js" type="text/javascript" charset="utf-8"></script>
<script src="https://jupyter.rwth-aachen.de/hub/static/components/bootstrap/dist/js/bootstrap.min.js" type="text/javascript" charset="utf-8"></script>
</head>
@@ -65,14 +65,14 @@
<p>Please run the following commands on one of the HPC frontend nodes:</p>
<pre>
<code class="language-bash">
- # Login to one of the HPC frontend nodes via your SSH key or password:
- $ ssh -l "{{hpc_username}}" login18-1.hpc.itc.rwth-aachen.de
+ # Login to one of the HPC frontend nodes via your SSH key or password
+ $ ssh -l "{{hpc_username}}" login.hpc.itc.rwth-aachen.de
# Switch to latest Python 3
module load python/3.9.1
# Install Jupyter scripts
- $ python3 -m pip install --user rwth-jupyter
+ $ python3 -m pip install --user --no-warn-script-location rwth-jupyter
# Connect to RWTHjupyter cluster
$ ~/.local/bin/rwth-jupyter
@@ -103,9 +103,8 @@
}
window.onload = function() {
- setInterval(checkReady, 1000);
+ setInterval(checkReady, 300);
}
</script>
-</body></html>
-
-
+ </body>
+</html>
--
GitLab