- Ask yes/no to confirm stopping the server

Miguel Barão
1 parent 2d620b8a
Showing 2 changed files with 20 additions and 5 deletions Show diff stats
serve.py
tools.py
@@ -9,6 +9,7 @@ import logging.config
 import argparse
 from concurrent.futures import ThreadPoolExecutor
 import mimetypes
+import signal
  
 # user installed libraries
 import tornado.ioloop
@@ -285,6 +286,16 @@ class QuestionHandler(BaseHandler):
                     }
                 })
  
+
+# -------------------------------------------------------------------------
+def signal_handler(signal, frame):
+    r = input(' --> Stop webserver? (yes/no) ')
+    if r in ('yes', 'YES'):
+        tornado.ioloop.IOLoop.current().stop()
+        logging.critical('Webserver stopped.')
+        sys.exit(0)
+
+
 # -------------------------------------------------------------------------
 # Tornado web server
 # ----------------------------------------------------------------------------
@@ -339,13 +350,17 @@ def main():
         http_server.listen(8443)
  
     # --- run webserver
-    logging.info('Webserver running...')
+    logging.info('Webserver running...  (Ctrl-C to stop)')
+    signal.signal(signal.SIGINT, signal_handler)
+
+
     try:
         tornado.ioloop.IOLoop.current().start()  # running...
-    except KeyboardInterrupt:
+    except Exception:
+        logging.critical('Webserver stopped.')
         tornado.ioloop.IOLoop.current().stop()
+        raise
  
-    logging.critical('Webserver stopped.')
  
 # ----------------------------------------------------------------------------
 if __name__ == "__main__":
@@ -16,11 +16,11 @@ from pygments.formatters import HtmlFormatter
 logger = logging.getLogger(__name__)
  
  
-# ---------------------------------------------------------------------------
+# -------------------------------------------------------------------------
 # Markdown to HTML renderer with support for LaTeX equations
 # Inline math: $x$
 # Block math: $$x$$ or \begin{equation}x\end{equation}
-# ---------------------------------------------------------------------------
+# -------------------------------------------------------------------------
 class MathBlockGrammar(mistune.BlockGrammar):
     block_math = re.compile(r"^\$\$(.*?)\$\$", re.DOTALL)
     latex_environment = re.compile(r"^\\begin\{([a-z]*\*?)\}(.*?)\\end\{\1\}", re.DOTALL)
...	...	@@ -9,6 +9,7 @@ import logging.config
9	9	import argparse
10	10	from concurrent.futures import ThreadPoolExecutor
11	11	import mimetypes
	12	+import signal
12	13
13	14	# user installed libraries
14	15	import tornado.ioloop
...	...	@@ -285,6 +286,16 @@ class QuestionHandler(BaseHandler):
285	286	}
286	287	})
287	288
	289	+
	290	+# -------------------------------------------------------------------------
	291	+def signal_handler(signal, frame):
	292	+ r = input(' --> Stop webserver? (yes/no) ')
	293	+ if r in ('yes', 'YES'):
	294	+ tornado.ioloop.IOLoop.current().stop()
	295	+ logging.critical('Webserver stopped.')
	296	+ sys.exit(0)
	297	+
	298	+
288	299	# -------------------------------------------------------------------------
289	300	# Tornado web server
290	301	# ----------------------------------------------------------------------------
...	...	@@ -339,13 +350,17 @@ def main():
339	350	http_server.listen(8443)
340	351
341	352	# --- run webserver
342		- logging.info('Webserver running...')
	353	+ logging.info('Webserver running... (Ctrl-C to stop)')
	354	+ signal.signal(signal.SIGINT, signal_handler)
	355	+
	356	+
343	357	try:
344	358	tornado.ioloop.IOLoop.current().start() # running...
345		- except KeyboardInterrupt:
	359	+ except Exception:
	360	+ logging.critical('Webserver stopped.')
346	361	tornado.ioloop.IOLoop.current().stop()
	362	+ raise
347	363
348		- logging.critical('Webserver stopped.')
349	364
350	365	# ----------------------------------------------------------------------------
351	366	if __name__ == "__main__":
...	...
...	...	@@ -16,11 +16,11 @@ from pygments.formatters import HtmlFormatter
16	16	logger = logging.getLogger(__name__)
17	17
18	18
19		-# ---------------------------------------------------------------------------
	19	+# -------------------------------------------------------------------------
20	20	# Markdown to HTML renderer with support for LaTeX equations
21	21	# Inline math: $x$
22	22	# Block math: $$x$$ or \begin{equation}x\end{equation}
23		-# ---------------------------------------------------------------------------
	23	+# -------------------------------------------------------------------------
24	24	class MathBlockGrammar(mistune.BlockGrammar):
25	25	block_math = re.compile(r"^\$\$(.*?)\$\$", re.DOTALL)
26	26	latex_environment = re.compile(r"^\\begin\{([a-z]\?)\}(.*?)\\end\{\1\}", re.DOTALL)
...	...