feat: make it possible to hide the simulator URL, or configure it

drogue-iot · Feb 24, 2022 · 5533c29 · 5533c29
1 parent c22c3e7
commit 5533c29
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 2 deletions.
diff --git a/doppelgaenger-websocket/main.py b/doppelgaenger-websocket/main.py
@@ -1,6 +1,6 @@
 import json
 import os
-from typing import Any
+import signal
 import tornado.websocket
 import tornado.httpserver
 import tornado.ioloop
@@ -10,6 +10,8 @@
 from logzero import logger
 from bson import json_util
 from healthcheck import TornadoHandler, HealthCheck
+import time
+
 
 health = HealthCheck()
 
@@ -66,6 +68,36 @@ async def watch(collection):
             ChangesHandler.on_change(change)
 
 
+class HomeHandler(tornado.web.RequestHandler):
+    def get(self):
+        self.render("templates/index.html", simulator_url=os.getenv("SIMULATOR_URL", ""))
+
+
+def sig_handler(sig, frame):
+    logger.warning('Caught signal: %s', sig)
+    tornado.ioloop.IOLoop.instance().add_callback(shutdown)
+
+MAX_WAIT_SECONDS_BEFORE_SHUTDOWN = 3
+
+def shutdown():
+    logger.info('Stopping http server')
+    server.stop()
+
+    logger.info('Will shutdown in %s seconds ...', MAX_WAIT_SECONDS_BEFORE_SHUTDOWN)
+    io_loop = tornado.ioloop.IOLoop.instance()
+
+    deadline = time.time() + MAX_WAIT_SECONDS_BEFORE_SHUTDOWN
+
+    def stop_loop():
+        now = time.time()
+        if now < deadline and (io_loop._callbacks or io_loop._timeouts):
+            io_loop.add_timeout(now + 1, stop_loop)
+        else:
+            io_loop.stop()
+            logging.info('Shutdown')
+    stop_loop()
+
+
 def main():
     load_dotenv()
 
@@ -75,13 +107,18 @@ def main():
     client = MotorClient(os.environ["MONGODB__URL"])
     collection = client[database][application]
 
+    global app
+
     app = tornado.web.Application(
         [
             (r"/socket", ChangesHandler),
             (
                 "/health",
                 TornadoHandler, dict(checker=health)
             ),
+            (
+                r"/", HomeHandler
+            ),
             (
                 r"/(.*)", tornado.web.StaticFileHandler,
                 {"path": "templates/", "default_filename": "index.html"}
@@ -92,6 +129,9 @@ def main():
 
     app.listen(8082)
 
+    signal.signal(signal.SIGTERM, sig_handler)
+    signal.signal(signal.SIGINT, sig_handler)
+
     loop = tornado.ioloop.IOLoop.current()
     loop.add_callback(watch, collection)
 
@@ -103,6 +143,8 @@ def main():
         if change_stream is not None:
             change_stream.close()
 
+    logger.wan("Exiting...")
+
 
 if __name__ == "__main__":
     main()
diff --git a/doppelgaenger-websocket/templates/index.html b/doppelgaenger-websocket/templates/index.html
@@ -44,7 +44,9 @@ <h1>Dashboard example</h1>
                 <ul class="list-group list-group-flush">
                     <li class="list-group-item">
                         <strong>State:</strong> <span id="state">?</span>
-                        <span class="float-end"><a href="https://device-simulator-burrboard.apps.wonderful.iot-playground.org/" target="_blank">Open Simulator</a> </span>
+                        {% if simulator_url != "" %}
+                        <span class="float-end"><a href="{{ simulator_url }}" target="_blank">Open Simulator</a> </span>
+                        {% end %}
                     </li>
                     <li  class="list-group-item" id="last-message-container">
                         <code id="last-message"></code>