From 994892a3c2577665e26addbcfbd295bbc68b48e8 Mon Sep 17 00:00:00 2001
From: Jeremy Nicklas <jnicklas@osc.edu>
Date: Wed, 15 Nov 2017 11:50:42 -0500
Subject: [PATCH] wait for server to start before showing view
---
template/after.sh | 8 ++++++++
view.html.erb | 6 ------
2 files changed, 8 insertions(+), 6 deletions(-)
create mode 100755 template/after.sh
diff --git a/template/after.sh b/template/after.sh
new file mode 100755
index 0000000..8153a04
--- /dev/null
+++ b/template/after.sh
@@ -0,0 +1,8 @@
+# Wait for the Jupyter Notebook server to start
+echo "Waiting for Jupyter Notebook server to open port ${port}..."
+if wait_until_port_used "${host}:${port}" 60; then
+ echo "Discovered Jupyter Notebook server listening on port ${port}!"
+else
+ echo "Timed out waiting for Jupyter Notebook server to open port ${port}!" ; exit 1
+fi
+sleep 2
diff --git a/view.html.erb b/view.html.erb
index 67b19c7..ea48d25 100644
--- a/view.html.erb
+++ b/view.html.erb
@@ -1,9 +1,3 @@
-<p>
- If you see <code>Failed to connect to ...</code>, then wait a few seconds
- before trying the <strong>Connect to Jupyter</strong> button again. This
- warning appeared because the Jupyter Notebook is still starting up.
-</p>
-
<form action="/node/<%= host %>/<%= port %>/login" method="post" target="_blank">
<input type="hidden" name="password" value="<%= password %>">
<button class="btn btn-primary" type="submit">
--
GitLab