- don't redirect to index in run and upload interfaces (now unused)

- pass pipe FD to usercode process so early logs/errors are caught.

Author: OldUser101

runner/start.py

@@ -67,16 +67,16 @@ def __init__(self):
         os.chown(self.USER_CODE_PATH, 1000, 1000) # pi:pi
 
         self.HOPPER_CLIENT = HopperClient()
+        
+        self.LOG_PIPE_NAME = PipeName((PipeType.INPUT, "log", "starter"), self.PIPE_DIRECTORY)
+        self.HOPPER_CLIENT.open_pipe(self.LOG_PIPE_NAME, delete=True, create=True)
 
         self.USER_PIPE_NAME = PipeName((PipeType.INPUT, "start-button", "starter"), self.PIPE_DIRECTORY)
         self.HOPPER_CLIENT.open_pipe(self.USER_PIPE_NAME, delete=True, create=True)
 
         self.FLASK_PIPE_NAME = PipeName((PipeType.OUTPUT, "starter", "starter"), self.PIPE_DIRECTORY)
         self.HOPPER_CLIENT.open_pipe(self.FLASK_PIPE_NAME, delete=True, create=True, blocking=True)
 
-        self.LOG_PIPE_NAME = PipeName((PipeType.INPUT, "log", "starter"), self.PIPE_DIRECTORY)
-        self.HOPPER_CLIENT.open_pipe(self.LOG_PIPE_NAME, delete=True, create=True)
-
         self.__load_start_graphic()
         self.__init_gpio()
 
@@ -105,6 +105,8 @@ def __start_usercode(self):
         # Send the erase escape sequence to clear remote logs
         self.HOPPER_CLIENT.write(self.LOG_PIPE_NAME, self.ERASE_ESCAPE_SEQUENCE)
 
+        pipe_fd = self.HOPPER_CLIENT.get_pipe_by_pipe_name(self.LOG_PIPE_NAME).fd
+
         environment = dict(os.environ)
         environment["PYTHONPATH"] = ROBOT_LIB_LOCATION
         # Start the user code.
@@ -113,7 +115,8 @@ def __start_usercode(self):
                 # python -u /path/to/the_code.py
                 sys.executable, "-u", self.USER_CODE_ENTRYPOINT_PATH,
             ],
-            stderr=subprocess.STDOUT,
+            stdout=pipe_fd,
+            stderr=pipe_fd,
             bufsize=1,  # Line-buffered
             close_fds="posix" in sys.builtin_module_names,  # Only if we're not on Windows
             env=environment,

shepherd/blueprints/run/__init__.py

@@ -47,7 +47,7 @@ def get_output():
 @blueprint.route("/toggle_auto_refresh", methods=["POST"])
 def toggle_auto_refresh():
     session["auto_refresh"] = not session.get("auto_refresh", True)
-    return redirect(url_for(".index"))
+    return "", 204
 
 @blueprint.route("/picture")
 def get_picture():
@@ -61,10 +61,10 @@ def start():
         "mode": mode.value,
         "zone": int(zone)
     })
-    return redirect(url_for(".index"))
+    return "", 204
 
 
 @blueprint.route("/stop", methods=["POST"])
 def stop():
     send("stop")
-    return redirect(url_for(".index"))
+    return "", 204

shepherd/blueprints/upload/__init__.py

@@ -36,7 +36,7 @@ def upload():
         else:
             flash("Your file looks good!", "success")  # TODO: run a linter on the code?
             run.send("upload")
-    return redirect(url_for(".index"))
+    return "", 204
 
 def chown_usercode():
     for root, dirs, files in os.walk(current_app.config["SHEPHERD_USER_CODE_PATH"]):