meerschaum 2.7.3__py3-none-any.whl → 2.7.4__py3-none-any.whl

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/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.7.3"
+__version__ = "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/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/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/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.dist-info → meerschaum-2.7.4.dist-info}/METADATA

@@ -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.dist-info → meerschaum-2.7.4.dist-info}/RECORD

@@ -44,7 +44,7 @@ meerschaum/actions/sh.py,sha256=hSkGNTVqP5dNjhJ64zy3V3VCFPTKnDlH3PxdKdxtkGQ,1990
 meerschaum/actions/show.py,sha256=T8Ol1o-762cI9rlUzd-8svvwgT4slYXYfOPQETh9Koo,28446
 meerschaum/actions/sql.py,sha256=vAsxbSl-Hkw3wfrM1BLnKex_kJrZwIJICAXysprQGWM,4220
 meerschaum/actions/stack.py,sha256=ZwrCTGJ0x3jjZkRieWcvqasQHYCqNtB1HYvTX-r3Z3g,5996
-meerschaum/actions/start.py,sha256=26i2Pqg3c_Ltw3lgYzl3sZL2wG0XBgOuJrPK8qPPHdI,21281
+meerschaum/actions/start.py,sha256=NtdVzeB00PQBnDSUSu8ypHmMrZT8_Idmw5BfVZ--Zic,21296
 meerschaum/actions/stop.py,sha256=5fdUw70YN-yuUWrC-NhA88cxr9FZ5NbssbQ8xXO8nFU,4632
 meerschaum/actions/sync.py,sha256=QGhf0ZyrNaplPL6TkwHO9VQLEu_Gemmid93vdaovXoo,17153
 meerschaum/actions/tag.py,sha256=SJf5qFW0ccLXjqlTdkK_0MCcrCMdg6xhYrhKdco0hdA,3053
@@ -143,7 +143,7 @@ meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6
 meerschaum/config/_read_config.py,sha256=RLC3HHi_1ndj7ITVDKLD9_uULY3caGRwSz3ATYE-ixA,15014
 meerschaum/config/_shell.py,sha256=46_m49Txc5q1rGfCgO49ca48BODx45DQJi8D0zz1R18,4245
 meerschaum/config/_sync.py,sha256=jHcWRkxd82_BgX8Xo8agsWvf7BSbv3qHLWmYl6ehp_0,4242
-meerschaum/config/_version.py,sha256=15LlFyoMeeTpuVYA_73PnLwLlzhwvMJLmuNnG_C0Rys,71
+meerschaum/config/_version.py,sha256=MXSVkU-_rIMkbFaFaLStOfNg5rNqfnzfD42W6YOfi6s,71
 meerschaum/config/paths.py,sha256=JjibeGN3YAdSNceRwsd42aNmeUrIgM6ndzC8qZAmNI0,621
 meerschaum/config/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/config/stack/__init__.py,sha256=2UukC0Lmk-aVL1o1qXzumqmuIrw3vu9fD7iCuz4XD4I,10544
@@ -212,7 +212,7 @@ meerschaum/core/User/_User.py,sha256=qbI0GIkr3G0PI4d9S49uatbJQ2kH_-z5-GoVJ0fuEtA
 meerschaum/core/User/__init__.py,sha256=9qNy-Gobui4x6GiaE8U7-WOggsdniOM3_wegLN3SVKs,988
 meerschaum/jobs/_Executor.py,sha256=qM62BhFTM4tyJ7p90KOM0y3qyeRY9k3ZV_aTDJMHnO8,1682
 meerschaum/jobs/_Job.py,sha256=wRsmrQ1bm898BxXELbHTltKYBj0bK0GmegE8zeL0FG8,32161
-meerschaum/jobs/__init__.py,sha256=1GFkF-bnkC_rnemKCW_WM9oIq7oyLglux3TssXGBwz0,12189
+meerschaum/jobs/__init__.py,sha256=YjwB6t8HCT593ckrOlImgk0kLX-1NgAYzNXVwS-uvyY,12173
 meerschaum/jobs/systemd.py,sha256=Rq-tsDPslG17ZhpKMrVJ5r8Z0IPr6DEc9APObfIoXCg,24614
 meerschaum/plugins/_Plugin.py,sha256=bIo4HX8TTWIcwIHROwMt4VK6OoEUhY_3Qc8q-2dp-ZA,33895
 meerschaum/plugins/__init__.py,sha256=6krcqaMKyzuVqesXMqEL0XEy2SJQ4xfNt2-oI_fJ6v0,26278
@@ -233,10 +233,10 @@ meerschaum/utils/threading.py,sha256=awjbVL_QR6G-o_9Qk85utac9cSdqkiC8tQSdERCdrG8
 meerschaum/utils/typing.py,sha256=U3MC347sh1umpa3Xr1k71eADyDmk4LB6TnVCpq8dVzI,2830
 meerschaum/utils/warnings.py,sha256=n-phr3BftNNgyPnvnXC_VMSjtCvjiCZ-ewmVfcROhkc,6611
 meerschaum/utils/yaml.py,sha256=PoC1du0pn2hLwTHwL-zuOf_EBWZSbCGOz-P-AZ4BWN0,3901
-meerschaum/utils/daemon/Daemon.py,sha256=R_LM0zZS4Tng5OQLNZ-Dzyk2dn_EPR7z8FNiphYgvBs,42622
+meerschaum/utils/daemon/Daemon.py,sha256=PfFu_yba5d9k8GW3mGmJRilenyNNoA9DEG2TiiFfyMI,42704
 meerschaum/utils/daemon/FileDescriptorInterceptor.py,sha256=MJKMO0Syf3d8yWUs6xXcQzg8Ptsuvh2aCRRoglOjusA,5257
 meerschaum/utils/daemon/RotatingFile.py,sha256=ePm_svjwyFDWh6V1k-bp1RHXCSWlyxDtlFu4SU4XvPU,24369
-meerschaum/utils/daemon/StdinFile.py,sha256=J6tyUReM8NEp3bBQAxMfe8mjJG5mWi6CzHN4x86VQBI,3237
+meerschaum/utils/daemon/StdinFile.py,sha256=qdZ8E_RSOkURypwnS50mWeyWyRig1bAY9tKWMTVKajc,3307
 meerschaum/utils/daemon/__init__.py,sha256=o9jWb4lRTIyny4EPt7fPXFgV_vIf1mUofsTwoE1ZecA,8751
 meerschaum/utils/daemon/_names.py,sha256=d2ZwTxBoTAqXZkCfZ5LuX2XrkQmLNUq1OTlUqfoH5dA,4515
 meerschaum/utils/dtypes/__init__.py,sha256=c6DoYyCbWvMdRapBRKP5UJYLRUWtkTIlC_8HRzXFh2s,12166
@@ -250,12 +250,12 @@ meerschaum/utils/packages/__init__.py,sha256=Op93VJkAX3OL4H-js_p3dAaa_PT82jvjCna
 meerschaum/utils/packages/_packages.py,sha256=ykannoLv2Fm4iwZwiIlNAGZvt654cMJhjXr1VJPoEDo,8867
 meerschaum/utils/packages/lazy_loader.py,sha256=VHnph3VozH29R4JnSSBfwtA5WKZYZQFT_GeQSShCnuc,2540
 meerschaum/utils/venv/_Venv.py,sha256=QsnDGEE_YBqXIq53NTWi2TANA1FbkqJBl_xQi9jQP_U,3537
-meerschaum/utils/venv/__init__.py,sha256=BZQ-c8aJi3xu3kdx0Ey0bnOa5n6XEVbpWZGgQRN6nwg,26208
-meerschaum-2.7.3.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-2.7.3.dist-info/METADATA,sha256=hvljI_CruYI5E630gkA_zwnUf53OTK_PCeJup-c9BIs,24224
-meerschaum-2.7.3.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-2.7.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-meerschaum-2.7.3.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-2.7.3.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-2.7.3.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-2.7.3.dist-info/RECORD,,
+meerschaum/utils/venv/__init__.py,sha256=m8tgZvk2VxYd6OHfiJlE1tpHo9b7hH69y1UmHeY6ncM,26679
+meerschaum-2.7.4.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-2.7.4.dist-info/METADATA,sha256=tHOCaQB1p7j8P6denDGdRHY4fhxNcTkqkzqBBo_r9SU,24224
+meerschaum-2.7.4.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-2.7.4.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+meerschaum-2.7.4.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-2.7.4.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-2.7.4.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-2.7.4.dist-info/RECORD,,