vsremote 0.2.1__tar.gz → 0.2.2__tar.gz

{vsremote-0.2.1 → vsremote-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: vsremote
-Version: 0.2.1
+Version: 0.2.2
 Summary: Remote execution and frame proxy for VapourSynth
 Author-email: Vardë <ichunjo.le.terrible@gmail.com>
 License-File: LICENSE

{vsremote-0.2.1 → vsremote-0.2.2}/src/vsremote/cli.py

@@ -119,7 +119,7 @@ def serve(
         pub, sec = zmq.curve_keypair()
         curve_public_key = pub.decode("ascii")
         curve_secret_key = sec.decode("ascii")
-        logger.info("CurveZMQ encryption enabled. Client public key: %s", curve_public_key)
+        logger.info("CurveZMQ encryption enabled. Server public key: %s", curve_public_key)
 
     runner = (
         ScriptRunner.from_script(script_path, environment=environment)

{vsremote-0.2.1 → vsremote-0.2.2}/src/vsremote/server/daemon.py

@@ -538,12 +538,14 @@ class ServerDaemon:
             await self._send_reply(req, StatusCode.OK, pack_payload(outputs))
         except ExecutionError as e:
             logger.debug("%s: %s", error_context, e)
-            await self._send_error(req, StatusCode.ERROR, _build_error_payload(e))
+            payload = _build_error_payload(e)
             await loop.run_in_executor(self._executor, self.runner.teardown_environment)
+            await self._send_error(req, StatusCode.ERROR, payload)
         except Exception as e:
             logger.exception(error_context)
-            await self._send_error(req, StatusCode.ERROR, _build_error_payload(e))
+            payload = _build_error_payload(e)
             await loop.run_in_executor(self._executor, self.runner.teardown_environment)
+            await self._send_error(req, StatusCode.ERROR, payload)
 
     async def _send_reply(
         self,

{vsremote-0.2.1 → vsremote-0.2.2}/src/vsremote/server/runner.py

@@ -186,19 +186,20 @@ class ScriptRunner:
             return list(self._output_items)
 
     def teardown_environment(self) -> None:
-        self._clips.clear()
-        self._clip_infos.clear()
-        self._output_items.clear()
-        self._startup_events.clear()
+        with self._rlock:
+            self._clips.clear()
+            self._clip_infos.clear()
+            self._output_items.clear()
+            self._startup_events.clear()
 
-        if self._script:
-            self._script.dispose()
-            self._script = None
+            if self._script:
+                self._script.dispose()
+                self._script = None
 
-        if isinstance(self._environment, ManagedEnvironment):
-            self._environment.dispose()
+            if isinstance(self._environment, ManagedEnvironment):
+                self._environment.dispose()
 
-        self._environment = None
+            self._environment = None
         gc_collect()
 
     def close(self) -> None: