meerschaum 2.7.3__tar.gz → 2.7.4__tar.gz

{meerschaum-2.7.3/meerschaum.egg-info → meerschaum-2.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.7.3
+Version: 2.7.4
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares

{meerschaum-2.7.3 → meerschaum-2.7.4}/meerschaum/actions/start.py

@@ -183,7 +183,7 @@ def _start_jobs(
         ### Cannot find dameon_id
         else:
             msg = (
-                f"Unknown job" + ('s' if len(action) != 1 else '') + ' '
+                "Unknown job" + ('s' if len(action) != 1 else '') + ' '
                 + items_str(action, and_str='or') + '.'
             )
             return False, msg
@@ -216,7 +216,7 @@ def _start_jobs(
         return job.start(debug=debug), name
 
     def _run_existing_job(name: str):
-        job = Job(name, executor_keys=executor_keys)
+        job = jobs.get(name, Job(name, executor_keys=executor_keys))
         return job.start(debug=debug), name
 
     if not names:

{meerschaum-2.7.3 → meerschaum-2.7.4}/meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.7.3"
+__version__ = "2.7.4"

{meerschaum-2.7.3 → meerschaum-2.7.4}/meerschaum/jobs/__init__.py

@@ -6,8 +6,6 @@
 Higher-level utilities for managing `meerschaum.utils.daemon.Daemon`.
 """
 
-import pathlib
-
 import meerschaum as mrsm
 from meerschaum.utils.typing import Dict, Optional, List, SuccessTuple
 

{meerschaum-2.7.3 → meerschaum-2.7.4}/meerschaum/utils/daemon/Daemon.py

@@ -13,7 +13,6 @@ import pathlib
 import json
 import shutil
 import signal
-import sys
 import time
 import traceback
 from functools import partial
@@ -301,6 +300,7 @@ class Daemon:
             os.environ['LINES'], os.environ['COLUMNS'] = str(int(lines)), str(int(columns))
             with self._daemon_context:
                 sys.stdin = self.stdin_file
+                _ = os.environ.pop(STATIC_CONFIG['environment']['systemd_stdin_path'], None)
                 os.environ[STATIC_CONFIG['environment']['daemon_id']] = self.daemon_id
                 os.environ['PYTHONUNBUFFERED'] = '1'
 

{meerschaum-2.7.3 → meerschaum-2.7.4}/meerschaum/utils/daemon/StdinFile.py

@@ -104,7 +104,10 @@ class StdinFile(io.TextIOBase):
         if self._file_handler is not None:
             self.sel.unregister(self._file_handler)
             self._file_handler.close()
-            os.close(self._fd)
+            try:
+                os.close(self._fd)
+            except OSError:
+                pass
             self._file_handler = None
             self._fd = None
 

{meerschaum-2.7.3 → meerschaum-2.7.4}/meerschaum/utils/venv/__init__.py

@@ -395,9 +395,13 @@ def init_venv(
 
     def update_lock(active: bool):
         try:
-            if active:
+            if not active:
+                if debug:
+                    print(f"Releasing lock: '{lock_path}'")
                 lock_path.unlink()
             else:
+                if debug:
+                    print(f"Acquiring lock: '{lock_path}'")
                 lock_path.touch()
         except Exception:
             pass
@@ -408,7 +412,10 @@ def init_venv(
         init_venv_check_start = time.perf_counter()
         while (time.perf_counter() - init_venv_check_start < max_lock_seconds):
             if not lock_path.exists():
-                continue
+                break
+
+            if debug:
+                print(f"Lock exists for '{venv}', sleeping...")
             time.sleep(step_sleep_seconds)
         update_lock(False)
 
@@ -441,10 +448,9 @@ def init_venv(
     rename_vtp = vtp.exists() and not temp_vtp.exists()
 
     if rename_vtp:
-        try:
-            vtp.rename(temp_vtp)
-        except FileExistsError:
-            pass
+        if debug:
+            print(f"Moving '{vtp}' to '{temp_vtp}'...")
+        shutil.move(vtp, temp_vtp)
 
     wait_for_lock()
     update_lock(True)
@@ -491,7 +497,9 @@ def init_venv(
                 + "Please install `virtualenv` via pip then restart Meerschaum."
             )
             if rename_vtp and temp_vtp.exists():
-                temp_vtp.rename(vtp)
+                if debug:
+                    print(f"Moving '{temp_vtp}' back to '{vtp}'...")
+                shutil.move(temp_vtp, vtp)
             update_lock(False)
             return False
 
@@ -530,7 +538,7 @@ def init_venv(
             import traceback
             traceback.print_exc()
             if rename_vtp and temp_vtp.exists():
-                temp_vtp.rename(vtp)
+                shutil.move(temp_vtp, vtp)
             update_lock(False)
             return False
     if verify:
@@ -538,7 +546,9 @@ def init_venv(
         verified_venvs.add(venv)
 
     if rename_vtp and temp_vtp.exists():
-        temp_vtp.rename(vtp)
+        if debug:
+            print(f"Cleanup: move '{temp_vtp}' back to '{vtp}'.")
+        shutil.move(temp_vtp, vtp)
 
     update_lock(False)
     return True

{meerschaum-2.7.3 → meerschaum-2.7.4/meerschaum.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerschaum
-Version: 2.7.3
+Version: 2.7.4
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares