fix: all output to logs/*

Author: Morriz

bin/start-api.sh

@@ -3,4 +3,4 @@
 
 kill $(fuser 8888/tcp 2>/dev/null | awk '{ print $1 }')
 
-PYTHONPATH=. python api/main.py main:app &
+PYTHONPATH=. python api/main.py main:app >logs/error.log 2>&1 &

bin/start-proxy.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . lib/functions.sh
 
-dcpp up
+dcpp up >logs/error.log 2>&1

lib/utils.py

@@ -9,12 +9,12 @@ def stream_output(process: subprocess.Popen[Any]) -> None:
 
 
 def run_command(command: List[str], cwd: str = None) -> int:
-    # pylint: disable=consider-using-with
-    process = subprocess.Popen(
-        command,
-        cwd=cwd,
-        stdout=subprocess.PIPE,
-    )
-    stream_output(process)
-    process.wait()
+    with open("logs/error.log", "w", encoding="utf-8") as f:
+        process = subprocess.run(
+            command,
+            check=True,
+            cwd=cwd,
+            stdout=f,
+            stderr=f,
+        )
     return process.returncode

lib/utils_test.py

@@ -15,8 +15,8 @@ class TestStreamOutput(unittest.TestCase):
     # Outputs the process stdout to sys.stdout.buffer.
     @mock.patch("subprocess.Popen")
     @mock.patch("sys.stdout.buffer.write")
-    def test_outputs_stdout(self, mock_write: Mock, mock_popen: Mock) -> None:
-        process = mock_popen.return_value
+    def test_outputs_stdout(self, mock_write: Mock, mock_run: Mock) -> None:
+        process = mock_run.return_value
         process.stdout.read.side_effect = [b"output1", b"output2", b""]
 
         stream_output(process)
@@ -26,8 +26,8 @@ def test_outputs_stdout(self, mock_write: Mock, mock_popen: Mock) -> None:
     # Handles the process stdout stream correctly.
     @mock.patch("subprocess.Popen")
     @mock.patch("sys.stdout.buffer.write")
-    def test_handles_stdout_stream(self, mock_write: Mock, mock_popen: Mock) -> None:
-        process = mock_popen.return_value
+    def test_handles_stdout_stream(self, mock_write: Mock, mock_run: Mock) -> None:
+        process = mock_run.return_value
         process.stdout.read.side_effect = [b"output1", b"output2", b""]
 
         stream_output(process)
@@ -38,20 +38,25 @@ def test_handles_stdout_stream(self, mock_write: Mock, mock_popen: Mock) -> None
 class TestRunCommand(unittest.TestCase):
 
     # Runs command with no errors and returns exit code
-    @mock.patch("lib.utils.stream_output")
-    @mock.patch("subprocess.Popen")
-    def test_runs_command_no_errors(self, mock_popen: Mock, _: Mock) -> None:
+    @mock.patch("builtins.open", new_callable=mock.mock_open)
+    @mock.patch("subprocess.run")
+    def test_runs_command_no_errors(self, mock_run: Mock, mock_open: Mock) -> None:
 
         # Set up mock
-        mock_process = mock_popen.return_value
+        mock_process = mock_run.return_value
         mock_process.returncode = 0
 
         # Call the function under test
         exit_code = run_command(["ls"])
 
         # Assert the exit code is returned correctly
         self.assertEqual(exit_code, 0)
-        mock_popen.assert_called_once_with(["ls"], cwd=None, stdout=subprocess.PIPE)
+        # Assert the open call was made correctly
+        mock_open.assert_called_with("logs/error.log", "w", encoding="utf-8")
+        # Assert the subprocess.run call was made correctly
+        mock_run.assert_called_once_with(
+            ["ls"], check=True, cwd=None, stdout=mock_open.return_value, stderr=mock_open.return_value
+        )
 
 
 if __name__ == "__main__":