meerschaum 2.3.0rc5__py3-none-any.whl → 2.3.2__py3-none-any.whl

meerschaum/jobs/_Job.py

@@ -58,6 +58,7 @@ class Job:
         self,
         name: str,
         sysargs: Union[List[str], str, None] = None,
+        env: Optional[Dict[str, str]] = None,
         executor_keys: Optional[str] = None,
         _properties: Optional[Dict[str, Any]] = None,
         _rotating_log = None,
@@ -78,6 +79,9 @@ class Job:
         sysargs: Union[List[str], str, None], default None
             The sysargs of the command to be executed, e.g. 'start api'.
 
+        env: Optional[Dict[str, str]], default None
+            If provided, set these environment variables in the job's process.
+
         executor_keys: Optional[str], default None
             If provided, execute the job remotely on an API instance, e.g. 'api:main'.
 
@@ -139,6 +143,9 @@ class Job:
         if _externally_managed:
             self._properties_patch.update({'externally_managed': _externally_managed})
 
+        if env:
+            self._properties_patch.update({'env': env})
+
         daemon_sysargs = (
             self._daemon.properties.get('target', {}).get('args', [None])[0]
             if self._daemon is not None
@@ -226,7 +233,12 @@ class Job:
         """
         if self.executor is not None:
             if not self.exists(debug=debug):
-                return self.executor.create_job(self.name, self.sysargs, debug=debug)
+                return self.executor.create_job(
+                    self.name,
+                    self.sysargs,
+                    properties=self.daemon.properties,
+                    debug=debug,
+                )
             return self.executor.start_job(self.name, debug=debug)
 
         if self.is_running():
@@ -882,6 +894,24 @@ class Job:
             self._externally_managed or self._externally_managed_file.exists()
         )
 
+    @property
+    def env(self) -> Dict[str, str]:
+        """
+        Return the environment variables to set for the job's process.
+        """
+        if '_env' in self.__dict__:
+            return self.__dict__['_env']
+
+        _env = self.daemon.properties.get('env', {})
+        default_env = {
+            'PYTHONUNBUFFERED': '1',
+            'LINES': str(get_config('jobs', 'terminal', 'lines')),
+            'COLUMNS': str(get_config('jobs', 'terminal', 'columns')),
+        }
+        self._env = {**default_env, **_env}
+        return self._env
+
+
     def __str__(self) -> str:
         sysargs = self.sysargs
         sysargs_str = shlex.join(sysargs) if sysargs else ''

meerschaum/jobs/__init__.py

@@ -16,6 +16,7 @@ from meerschaum.jobs._Executor import Executor
 
 __all__ = (
     'Job',
+    'systemd',
     'get_jobs',
     'get_filtered_jobs',
     'get_restart_jobs',
@@ -23,8 +24,8 @@ __all__ = (
     'get_stopped_jobs',
     'get_paused_jobs',
     'get_restart_jobs',
-    'Executor',
     'make_executor',
+    'Executor',
     'check_restart_jobs',
     'start_check_jobs_thread',
     'stop_check_jobs_thread',
@@ -126,6 +127,7 @@ def get_filtered_jobs(
     executor_keys: Optional[str] = None,
     filter_list: Optional[List[str]] = None,
     include_hidden: bool = False,
+    combine_local_and_systemd: bool = True,
     warn: bool = False,
     debug: bool = False,
 ) -> Dict[str, Job]:
@@ -133,7 +135,12 @@ def get_filtered_jobs(
     Return a list of jobs filtered by the user.
     """
     from meerschaum.utils.warnings import warn as _warn
-    jobs = get_jobs(executor_keys, include_hidden=True, debug=debug)
+    jobs = get_jobs(
+        executor_keys,
+        include_hidden=True,
+        combine_local_and_systemd=combine_local_and_systemd,
+        debug=debug,
+    )
     if not filter_list:
         return {
             name: job
@@ -160,13 +167,19 @@ def get_restart_jobs(
     executor_keys: Optional[str] = None,
     jobs: Optional[Dict[str, Job]] = None,
     include_hidden: bool = False,
+    combine_local_and_systemd: bool = True,
     debug: bool = False,
 ) -> Dict[str, Job]:
     """
     Return jobs which were created with `--restart` or `--loop`.
     """
     if jobs is None:
-        jobs = get_jobs(executor_keys, include_hidden=include_hidden, debug=debug)
+        jobs = get_jobs(
+            executor_keys,
+            include_hidden=include_hidden,
+            combine_local_and_systemd=combine_local_and_systemd,
+            debug=debug,
+        )
 
     return {
         name: job
@@ -179,13 +192,19 @@ def get_running_jobs(
     executor_keys: Optional[str] = None,
     jobs: Optional[Dict[str, Job]] = None,
     include_hidden: bool = False,
+    combine_local_and_systemd: bool = True,
     debug: bool = False,
 ) -> Dict[str, Job]:
     """
     Return a dictionary of running jobs.
     """
     if jobs is None:
-        jobs = get_jobs(executor_keys, include_hidden=include_hidden, debug=debug)
+        jobs = get_jobs(
+            executor_keys,
+            include_hidden=include_hidden,
+            combine_local_and_systemd=combine_local_and_systemd,
+            debug=debug,
+        )
 
     return {
         name: job
@@ -198,13 +217,19 @@ def get_paused_jobs(
     executor_keys: Optional[str] = None,
     jobs: Optional[Dict[str, Job]] = None,
     include_hidden: bool = False,
+    combine_local_and_systemd: bool = True,
     debug: bool = False,
 ) -> Dict[str, Job]:
     """
     Return a dictionary of paused jobs.
     """
     if jobs is None:
-        jobs = get_jobs(executor_keys, include_hidden=include_hidden, debug=debug)
+        jobs = get_jobs(
+            executor_keys,
+            include_hidden=include_hidden,
+            combine_local_and_systemd=combine_local_and_systemd,
+            debug=debug,
+        )
 
     return {
         name: job
@@ -217,13 +242,19 @@ def get_stopped_jobs(
     executor_keys: Optional[str] = None,
     jobs: Optional[Dict[str, Job]] = None,
     include_hidden: bool = False,
+    combine_local_and_systemd: bool = True,
     debug: bool = False,
 ) -> Dict[str, Job]:
     """
     Return a dictionary of stopped jobs.
     """
     if jobs is None:
-        jobs = get_jobs(executor_keys, include_hidden=include_hidden, debug=debug)
+        jobs = get_jobs(
+            executor_keys,
+            include_hidden=include_hidden,
+            combine_local_and_systemd=combine_local_and_systemd,
+            debug=debug,
+        )
 
     return {
         name: job
@@ -273,6 +304,7 @@ def check_restart_jobs(
         jobs = get_jobs(
             executor_keys,
             include_hidden=include_hidden,
+            combine_local_and_systemd=False,
             debug=debug,
         )
 
@@ -384,12 +416,18 @@ def _install_healthcheck_job() -> SuccessTuple:
     """
     Install the systemd job which checks local jobs.
     """
+    from meerschaum.config import get_config
+
+    enable_healthcheck = get_config('system', 'experimental', 'systemd_healthcheck')
+    if not enable_healthcheck:
+        return False, "Local healthcheck is disabled."
+
     if get_executor_keys_from_context() != 'systemd':
         return False, "Not running systemd."
 
     job = Job(
         '.local-healthcheck',
-        ['restart', 'jobs', '-e', 'local', '--loop'],
+        ['restart', 'jobs', '-e', 'local', '--loop', '--min-seconds', '60'],
         executor_keys='systemd',
     )
     return job.start()

meerschaum/jobs/{_SystemdExecutor.py → systemd.py}

@@ -129,6 +129,7 @@ class SystemdExecutor(Executor):
         service_logs_path = self.get_service_logs_path(name, debug=debug)
         socket_path = self.get_socket_path(name, debug=debug)
         result_path = self.get_result_path(name, debug=debug)
+        job = self.get_hidden_job(name, debug=debug)
 
         sysargs_str = shlex.join(sysargs)
         exec_str = f'{sys.executable} -m meerschaum {sysargs_str}'
@@ -145,9 +146,11 @@ class SystemdExecutor(Executor):
             STATIC_CONFIG['environment']['systemd_log_path']: service_logs_path.as_posix(),
             STATIC_CONFIG['environment']['systemd_result_path']: result_path.as_posix(),
             STATIC_CONFIG['environment']['systemd_stdin_path']: socket_path.as_posix(),
-            'LINES': get_config('jobs', 'terminal', 'lines'),
-            'COLUMNS': get_config('jobs', 'terminal', 'columns'),
         })
+
+        ### Allow for user-defined environment variables.
+        mrsm_env_vars.update(job.env)
+
         environment_lines = [
             f"Environment={key}={val}"
             for key, val in mrsm_env_vars.items()
@@ -190,7 +193,13 @@ class SystemdExecutor(Executor):
         )
         return socket_text
 
-    def get_hidden_job(self, name: str, sysargs: Optional[List[str]] = None, debug: bool = False):
+    def get_hidden_job(
+        self,
+        name: str,
+        sysargs: Optional[List[str]] = None,
+        properties: Optional[Dict[str, Any]] = None,
+        debug: bool = False,
+    ):
         """
         Return the hidden "sister" job to store a job's parameters.
         """
@@ -198,13 +207,13 @@ class SystemdExecutor(Executor):
             name,
             sysargs,
             executor_keys='local',
+            _properties=properties,
             _rotating_log=self.get_job_rotating_file(name, debug=debug),
             _stdin_file=self.get_job_stdin_file(name, debug=debug),
             _status_hook=partial(self.get_job_status, name),
             _result_hook=partial(self.get_job_result, name),
             _externally_managed=True,
         )
-        job._set_externally_managed()
         return job
 
 
@@ -213,6 +222,7 @@ class SystemdExecutor(Executor):
         Return metadata about a job.
         """
         now = time.perf_counter()
+
         if '_jobs_metadata' not in self.__dict__:
             self._jobs_metadata: Dict[str, Any] = {}
 
@@ -231,6 +241,7 @@ class SystemdExecutor(Executor):
             'daemon': {
                 'status': self.get_job_status(name, debug=debug),
                 'pid': self.get_job_pid(name, debug=debug),
+                'properties': self.get_job_properties(name, debug=debug),
             },
         }
         self._jobs_metadata[name] = {
@@ -245,17 +256,24 @@ class SystemdExecutor(Executor):
         """
         from meerschaum.jobs._Job import RESTART_FLAGS
         sysargs = self.get_job_sysargs(name, debug=debug)
+        if not sysargs:
+            return False
+
         for flag in RESTART_FLAGS:
             if flag in sysargs:
                 return True
+
         return False
 
     def get_job_properties(self, name: str, debug: bool = False) -> Dict[str, Any]:
         """
         Return the properties for a job.
         """
-        metadata = self.get_job_metadata(name, debug=debug)
-        return metadata.get('daemon', {}).get('properties', {})
+        job = self.get_hidden_job(name, debug=debug)
+        return {
+            k: v for k, v in job.daemon.properties.items()
+            if k != 'externally_managed'
+        }
 
     def get_job_process(self, name: str, debug: bool = False):
         """
@@ -499,7 +517,13 @@ class SystemdExecutor(Executor):
 
         return self._stdin_files[name]
 
-    def create_job(self, name: str, sysargs: List[str], debug: bool = False) -> SuccessTuple:
+    def create_job(
+        self,
+        name: str,
+        sysargs: List[str],
+        properties: Optional[Dict[str, Any]] = None,
+        debug: bool = False,
+    ) -> SuccessTuple:
         """
         Create a job as a service to be run by `systemd`.
         """
@@ -510,8 +534,18 @@ class SystemdExecutor(Executor):
         socket_stdin = self.get_job_stdin_file(name, debug=debug)
         _ = socket_stdin.file_handler
 
-        ### Init the `externally_managed file`.
-        _ = self.get_hidden_job(name, debug=debug)
+        ### Init the externally_managed file.
+        ### NOTE: We must write the pickle file in addition to the properties file.
+        job = self.get_hidden_job(name, sysargs=sysargs, properties=properties, debug=debug)
+        job._set_externally_managed()
+        pickle_success, pickle_msg = job.daemon.write_pickle()
+        if not pickle_success:
+            return pickle_success, pickle_msg
+        properties_success, properties_msg = job.daemon.write_properties()
+        if not properties_success:
+            return properties_success, properties_msg
+
+        service_file_path.parent.mkdir(parents=True, exist_ok=True)
 
         with open(service_file_path, 'w+', encoding='utf-8') as f:
             f.write(self.get_service_file_text(name, sysargs, debug=debug))

meerschaum/plugins/_Plugin.py

@@ -654,7 +654,7 @@ class Plugin:
             import ast, re
             ### NOTE: This technically would break 
             ### if `required` was the very first line of the file.
-            req_start_match = re.search(r'required(:\s*)?.*=', text)
+            req_start_match = re.search(r'\nrequired(:\s*)?.*=', text)
             if not req_start_match:
                 return []
             req_start = req_start_match.start()

meerschaum/plugins/__init__.py

@@ -28,7 +28,8 @@ _locks = {
     'PLUGINS_INTERNAL_LOCK_PATH': RLock(),
 }
 __all__ = (
-    "Plugin", "make_action", "api_plugin", "dash_plugin", "import_plugins",
+    "Plugin", "make_action", "api_plugin", "dash_plugin", "web_page",
+    "import_plugins", "from_plugin_import",
     "reload_plugins", "get_plugins", "get_data_plugins", "add_plugin_argument",
     "pre_sync_hook", "post_sync_hook",
 )

meerschaum/utils/daemon/Daemon.py

@@ -141,6 +141,7 @@ class Daemon:
         target: Optional[Callable[[Any], Any]] = None,
         target_args: Union[List[Any], Tuple[Any], None] = None,
         target_kw: Optional[Dict[str, Any]] = None,
+        env: Optional[Dict[str, str]] = None,
         daemon_id: Optional[str] = None,
         label: Optional[str] = None,
         properties: Optional[Dict[str, Any]] = None,
@@ -157,6 +158,9 @@ class Daemon:
         target_kw: Optional[Dict[str, Any]], default None
             Keyword arguments to pass to the target function.
 
+        env: Optional[Dict[str, str]], default None
+            If provided, set these environment variables in the daemon process.
+
         daemon_id: Optional[str], default None
             Build a `Daemon` from an existing `daemon_id`.
             If `daemon_id` is provided, other arguments are ignored and are derived
@@ -227,7 +231,11 @@ class Daemon:
             self._properties = properties
         if self._properties is None:
             self._properties = {}
+
         self._properties.update({'label': self.label})
+        if env:
+            self._properties.update({'env': env})
+
         ### Instantiate the process and if it doesn't exist, make sure the PID is removed.
         _ = self.process
 
@@ -295,6 +303,12 @@ class Daemon:
                 sys.stdin = self.stdin_file
                 os.environ[STATIC_CONFIG['environment']['daemon_id']] = self.daemon_id
                 os.environ['PYTHONUNBUFFERED'] = '1'
+
+                ### Allow the user to override environment variables.
+                env = self.properties.get('env', {})
+                if env and isinstance(env, dict):
+                    os.environ.update({str(k): str(v) for k, v in env.items()})
+
                 self.rotating_log.refresh_files(start_interception=True)
                 result = None
                 try:

{meerschaum-2.3.0rc5.dist-info → meerschaum-2.3.2.dist-info}/METADATA

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

{meerschaum-2.3.0rc5.dist-info → meerschaum-2.3.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
-meerschaum/__init__.py,sha256=rzLJwaiLJvc_VAOjUM6pzKlm-w8NhHrOCH99Ob1vrjY,1736
+meerschaum/__init__.py,sha256=6bn5zz7VInDP4fE_FGBMzJYrM6rQhBMJNQqsf1pU7eI,1701
 meerschaum/__main__.py,sha256=r5UjYxH1WA6dGG9YGBPul5xOdgF3Iwl0X4dWDtXU-30,2646
 meerschaum/_internal/__init__.py,sha256=ilC7utfKtin7GAvuN34fKyUQYfPyqH0Mm3MJF5iyEf4,169
 meerschaum/_internal/entry.py,sha256=psQ6zltjBk-9663jT_JiYq34qr6Izk7oLoLCBayYjK8,10125
 meerschaum/_internal/arguments/__init__.py,sha256=CbNgnlH6fqNI5n7EuQC6m3Do6ckXDqw4Vuc4T_qPJGQ,566
-meerschaum/_internal/arguments/_parse_arguments.py,sha256=WJ_sNgv2gQXBnMkAwIeyGM8c_2KX6G2OGgTMJw0FPzg,12736
-meerschaum/_internal/arguments/_parser.py,sha256=k3r_f7S8-Czyi-MmxoGLGqNti7sXGVJUxHm9Rfhmq5A,14904
+meerschaum/_internal/arguments/_parse_arguments.py,sha256=6Tf9xTXZA-wH51Ep_iuG5JFLzD2rYevuA8n69FTi6Mk,12984
+meerschaum/_internal/arguments/_parser.py,sha256=LfiVDTr1akj5D31qpJAAXKxMcnLQiD3jRpZtvvHWrAo,14917
 meerschaum/_internal/docs/__init__.py,sha256=ZQYHWo6n0kfLLkyG36YXqTYvv2Pc7it5HZHMylT6cBA,126
-meerschaum/_internal/docs/index.py,sha256=Qovl1fI-KqCz7KtxCIWklqUGUcJ8Sbx4UKAEarrUn_A,18056
+meerschaum/_internal/docs/index.py,sha256=LwpPMX5ODsv-CSLOmwKhJpYdEK4LBrZ260yJhYwN0L8,24389
 meerschaum/_internal/gui/__init__.py,sha256=KF6Opae0aBOjIndMZ2txoPs7ozCXRlR-lcTsicLO7fc,1313
 meerschaum/_internal/gui/app/__init__.py,sha256=rKUa8hHk6Fai-PDF61tQcpT1myxKcfmvEMDHxThNp7o,1565
 meerschaum/_internal/gui/app/_windows.py,sha256=-VHdjTzA3V596fVqnbmTxemONSp_80-sTNJ0CTB8FwU,2632
@@ -21,7 +21,7 @@ meerschaum/_internal/shell/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 meerschaum/_internal/term/TermPageHandler.py,sha256=Rt5S47Pr_3HLJc8xIXpZUczYE_Dw2qT8qwf1jZFtUHQ,520
 meerschaum/_internal/term/__init__.py,sha256=eXjfRzpnASWomB4xpY2AfzC_CLenkInNnVWSLZEexlg,1638
 meerschaum/_internal/term/tools.py,sha256=dXVAimKD-Yv2fg2WOTr0YGBY7XDKjQqw-RizcS65YVI,727
-meerschaum/actions/__init__.py,sha256=A-xwztWrq9xL_FbiBcoNB9-WKfwzYlFerh4XFl-Ao5c,11515
+meerschaum/actions/__init__.py,sha256=MHPs8aRBhbZQXnqd_6tVtisTrNCgPAPgnNcXYbn0zP8,11640
 meerschaum/actions/api.py,sha256=8wjREHNRkl8WBgtz1KfWmAVjeFR_J2j7ghXjSyYUW3g,12603
 meerschaum/actions/attach.py,sha256=UV19d9W_2WYcrf7BRz7k3mriDoX1V4rA4AKvbLdor0o,3106
 meerschaum/actions/bootstrap.py,sha256=9D3cBHzgZbZyWy-Y7iQgk9bpTbKEhumFKbIIThZgPXI,14058
@@ -38,13 +38,13 @@ meerschaum/actions/pause.py,sha256=WI4dQFfjQ6ObWKUzwQ5FrtYPDyEcnxWwval8cSIzzJw,4
 meerschaum/actions/python.py,sha256=aoSaDSIQ-wJixexFDtsxBMqITktba3DLkJNFIra_6qk,4546
 meerschaum/actions/register.py,sha256=bOQY0AlZlchsxPF27LL7G1OgdiCyj7mkBaD-PO6bFZc,14491
 meerschaum/actions/reload.py,sha256=gMXeFBGVfyQ7uhKhYf6bLaDMD0fLPcA9BrLBSiuvWIc,508
-meerschaum/actions/restart.py,sha256=6GcIVfyDnNckM54khf66FxTfEo0babikccKvN7tEPq4,2923
+meerschaum/actions/restart.py,sha256=6ffp3-X9eTEgunVSdD41HnOwqp71yjuSAmXJ5j39ONI,3038
 meerschaum/actions/setup.py,sha256=KkAGWcgwzl_L6A19fTmTX1KtBjW2FwD8QenLjPy0mQQ,3205
 meerschaum/actions/sh.py,sha256=fLfTJaacKu4sjLTRqEzzYlT2WbbdZBEczsKb6F-qAek,2026
 meerschaum/actions/show.py,sha256=Ij6v5so9GHUrYVi7AhPfhHGjABBofXTPAljLFa2xuWA,28141
 meerschaum/actions/sql.py,sha256=wYofwk1vGO96U2ncigGEfMtYMZeprz2FR1PRRZhkAPI,4311
 meerschaum/actions/stack.py,sha256=7ODAxzmCx8i9AHxvkbr5ZtzUNPpY-iqlSVo4rZHMOw4,5900
-meerschaum/actions/start.py,sha256=RI01BqIpsxKKZoJgvRVAhv8quf1mXjBvvt2gUBTcfEo,19344
+meerschaum/actions/start.py,sha256=R3ooagL5VazTrC2yOSjakROSC3FoYT1NYhmWF1gsbFo,19262
 meerschaum/actions/stop.py,sha256=5fdUw70YN-yuUWrC-NhA88cxr9FZ5NbssbQ8xXO8nFU,4632
 meerschaum/actions/sync.py,sha256=AkH-1O5bkUC-UElQGr0lRhrX-z18ZY2nBPSy9EsW1Kc,17506
 meerschaum/actions/tag.py,sha256=SJf5qFW0ccLXjqlTdkK_0MCcrCMdg6xhYrhKdco0hdA,3053
@@ -118,7 +118,7 @@ meerschaum/api/routes/__init__.py,sha256=jbkeFNl51Tg8aT5gWe560ZLZLojFJsLMe5IENRj
 meerschaum/api/routes/_actions.py,sha256=J_d0jcBZbVDLfzqjR7Ar58oflA-dRQ2oCFYpvk5HHRE,6201
 meerschaum/api/routes/_connectors.py,sha256=NNbcn5xWhKqw2PqueSEaqRaZ95hFGDKazG5lE7gsssc,1849
 meerschaum/api/routes/_index.py,sha256=QI6CBo6pI2Zi0a6fJHDjZfiLa9f4okb0BGe3A_JD0kM,578
-meerschaum/api/routes/_jobs.py,sha256=593jLAdF2N28USjLEfyIABpD3c4CuajLDbVZu41WuOU,10977
+meerschaum/api/routes/_jobs.py,sha256=gmbgz_yqJB8K6nJVrzzPCnGRC5Kh6g5iiVGLNvZjUQM,11222
 meerschaum/api/routes/_login.py,sha256=psPKmFkXgYVX83NepqwIhaLsQ5uWgOc4F2QZtPGxY1A,2482
 meerschaum/api/routes/_misc.py,sha256=05--9ZVFeaCgZrHER2kA3SYdK4TyfkEXOCjLvPbum-w,2469
 meerschaum/api/routes/_pipes.py,sha256=1gBuE4E-QvIK_kmbmiw7uLcXjnIobFI1t4tb2skpp6E,21592
@@ -129,7 +129,7 @@ meerschaum/api/routes/_webterm.py,sha256=7eilgDXckpEc2LyeNmJS5YO6HxlyMkwPnAMWd7e
 meerschaum/api/tables/__init__.py,sha256=e2aNC0CdlWICTUMx1i9RauF8Pm426J0RZJbsJWv4SWo,482
 meerschaum/config/__init__.py,sha256=jZgQSjvbOWyvGouqRgIeYBg9Pp343_9CDsCWWpwYDGY,11577
 meerschaum/config/_dash.py,sha256=BJHl4xMrQB-YHUEU7ldEW8q_nOPoIRSOqLrfGElc6Dw,187
-meerschaum/config/_default.py,sha256=8ryAQV9yYkpIZaVYe9W7dm5c-WAu_lX1jSKGLLo4FtQ,5311
+meerschaum/config/_default.py,sha256=SsS80gbxoiYnrmgzpgqmOJIvy0ubT-GI7PpH04UEMv4,5349
 meerschaum/config/_edit.py,sha256=_kabgFbJdI5kcLs-JIsoaTo0JdyxnPnBdrlTyTAgPm8,8236
 meerschaum/config/_environment.py,sha256=Vv4DLDfc2vKLbCLsMvkQDj77K4kEvHKEBmUBo-wCrgo,4419
 meerschaum/config/_formatting.py,sha256=OMuqS1EWOsj_34wSs2tOqGIWci3bTMIZ5l-uelZgsIM,6672
@@ -140,7 +140,7 @@ meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6
 meerschaum/config/_read_config.py,sha256=WFZKIXZMDe_ca0ES7ivgM_mnwShvFxLdoeisT_X5-h0,14720
 meerschaum/config/_shell.py,sha256=46_m49Txc5q1rGfCgO49ca48BODx45DQJi8D0zz1R18,4245
 meerschaum/config/_sync.py,sha256=oK2ZujO2T1he08BXCFyiniBUevNGWSQKXLcS_jRv_7Y,4155
-meerschaum/config/_version.py,sha256=vbuOXg7cu08l1X04IxH-oKG_9tc2_ZMV5OZnH2nmCsk,74
+meerschaum/config/_version.py,sha256=FngJT1BF6959BwyIxw5aYINdEHg4LRf7Wpv2OjrU3nE,71
 meerschaum/config/paths.py,sha256=JjibeGN3YAdSNceRwsd42aNmeUrIgM6ndzC8qZAmNI0,621
 meerschaum/config/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/config/stack/__init__.py,sha256=Yt7GNzC_hz7iUDZ4gVho_lugJO2DnXgnMtsMG_ReoRg,9114
@@ -150,14 +150,14 @@ meerschaum/config/stack/mosquitto/resources/__init__.py,sha256=47DEQpj8HBSa-_TIm
 meerschaum/config/stack/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/config/static/__init__.py,sha256=bSugcNkYKnApqUxT0LcpqE_3-2tyJfTu2fDmzbB4fVM,5127
 meerschaum/connectors/Connector.py,sha256=utNV3Fy5DhUVbQE-vtm7enH5rH2gxQERmgmP7PUzH30,6682
-meerschaum/connectors/__init__.py,sha256=b1RdpMUNWtA5Q4KbymeUt9HtEiMWUHf0BBXzcl4itkc,12557
+meerschaum/connectors/__init__.py,sha256=fLoatCZV2hsDffYEg2aBzqPLzM_2o1_Z3X2iZvLwoqA,12503
 meerschaum/connectors/parse.py,sha256=sDeI2OIS9Inwhbn9jkFAXxOPnmmAHqsuHiiHfWjVnSA,4307
 meerschaum/connectors/poll.py,sha256=gIY9TvFBqMvMNQvR0O2No7koLLz2PjfExBr_Dsosgpg,7363
 meerschaum/connectors/api/APIConnector.py,sha256=MPYeImCBAeSpueYis5CxkfT7kkV82MnGKDLoNE8uOVw,5017
 meerschaum/connectors/api/__init__.py,sha256=JwKrGtuE5aOd2VnsRwudFBYyBf5IxczOwPVdNvCUgSQ,205
 meerschaum/connectors/api/_actions.py,sha256=Vg_ugl02MUjYtfyx0o9jt5ZoluNC0J1R-UEIRlcIpMI,4701
 meerschaum/connectors/api/_fetch.py,sha256=Khq9AFr1nk8Dsmcedb77aWhAuHw0JGgVeahDG95Q5MQ,2072
-meerschaum/connectors/api/_jobs.py,sha256=XlZXuTbkqDzrp6WgoD8OskGUfrKf2VbayhuB_WbRkzw,11066
+meerschaum/connectors/api/_jobs.py,sha256=bPQpnacqiJwXxrMEDgsv63Dn6KRprTvDqdeEmpZhkFw,11249
 meerschaum/connectors/api/_login.py,sha256=5GsD-B214vr5EYfM3XrTUs1sTFApxZA-9dNxq8oNSyg,2050
 meerschaum/connectors/api/_misc.py,sha256=OZRZBYOokKIEjmQaR8jUYgu6ZRn9VzXBChzR8CfDv_w,1092
 meerschaum/connectors/api/_pipes.py,sha256=Nnc-IShiTkCia548dePymKosQCcl2InFCyUX3Q-Xx6Q,20604
@@ -200,13 +200,12 @@ meerschaum/core/Pipe/_verify.py,sha256=KSnthUzImRLjt9fxyBaLvArqDuOLRpKBfk0tnseJC
 meerschaum/core/Plugin/__init__.py,sha256=UXg64EvJPgI1PCxkY_KM02-ZmBm4FZpLPIQR_uSJJDc,137
 meerschaum/core/User/_User.py,sha256=CApB7Y0QJL6S9QOCCfrG4SbPuPXJ9AsAYQ5pASMP_Aw,6527
 meerschaum/core/User/__init__.py,sha256=lJ7beIZTG9sO4dAi3367fFBl17dXYEWHKi7HoaPlDyk,193
-meerschaum/jobs/_Executor.py,sha256=ZUsQl0hgU0HW_F9bQCfm8KwrdyTBLCrfxsSnbJOwtWI,1575
-meerschaum/jobs/_Job.py,sha256=KpNIy71twW6kU6EEMv9Hc7E_-5ELX1m3rUjR4fQvTE4,30114
-meerschaum/jobs/_LocalExecutor.py,sha256=v_zvU1vgJDy-iiztXS5gnMayJ0UZnW48qJj3OSB6o-k,2195
-meerschaum/jobs/_SystemdExecutor.py,sha256=UqxAvUra4fxNruy2OZlBVFKIidWVPCAKsOKDdGSrMwk,23225
-meerschaum/jobs/__init__.py,sha256=NnzkkvCMAmXvMhzpFtj163K7cgzcQupDjf1ErBTfn3s,10838
-meerschaum/plugins/_Plugin.py,sha256=q1B4gVAO2BGA-PIR0HI3-O9q1n8BaT7tSANIyW7gUPg,34084
-meerschaum/plugins/__init__.py,sha256=3Hg9yyfkN0TxPPTnlt6pi53znjRIAR92WpG3zEKYm10,26152
+meerschaum/jobs/_Executor.py,sha256=qM62BhFTM4tyJ7p90KOM0y3qyeRY9k3ZV_aTDJMHnO8,1682
+meerschaum/jobs/_Job.py,sha256=leyW98wPQUJwvF68zL4vSScalpy6v-e9CiDynoI6aPk,31056
+meerschaum/jobs/__init__.py,sha256=iM-2rEqxVMVZxwYQYsMPDx1wpJs9Lb4xQcguKCI6okU,11899
+meerschaum/jobs/systemd.py,sha256=H1hdUh7QJs-DSZ7-jEYZ0NLNEplWmyFo2zt2LAsZO9M,24147
+meerschaum/plugins/_Plugin.py,sha256=p6j39tm-xrZENBq-eGtixBuXxLLddtEKWRCRFNqpRu0,34086
+meerschaum/plugins/__init__.py,sha256=trMQ53qgP7ikJhhV_uXzqJw6X1NDz2rPOGXFk40bb1Y,26190
 meerschaum/plugins/bootstrap.py,sha256=qg9MQ1YAU8ShwGqWDl38WjiXLIxDPl95pSIGDLN9rOw,11423
 meerschaum/utils/__init__.py,sha256=QrK1K9hIbPCRCM5k2nZGFqGnrqhA0Eh-iSmCU7FG6Cs,612
 meerschaum/utils/_get_pipes.py,sha256=dlPckpYYyM0IwRZ2VL0u9DiEeYhr5Ho9gkzvWxzNVwI,11460
@@ -224,7 +223,7 @@ meerschaum/utils/threading.py,sha256=3N8JXPAnwqJiSjuQcbbJg3Rv9-CCUMJpeQRfKFR7MaA
 meerschaum/utils/typing.py,sha256=U3MC347sh1umpa3Xr1k71eADyDmk4LB6TnVCpq8dVzI,2830
 meerschaum/utils/warnings.py,sha256=IDiwYspsfjIi1gtk3V9cSo9vNLckB9bCsHhRClpPJTc,6639
 meerschaum/utils/yaml.py,sha256=Da9ZtNdT8f68sqz6g4eLQM3jz8QQ2J9_FglX-fw5VXY,3901
-meerschaum/utils/daemon/Daemon.py,sha256=8MPsHwZT_X9zZ9nxNlwa80PpwkB_NJYp3aBsfxTEW54,41640
+meerschaum/utils/daemon/Daemon.py,sha256=rLUjJTGwKVUGVTHyz_A_lUJ_Wb2CgzT1ZFLhLwvGiNk,42142
 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
@@ -242,11 +241,11 @@ meerschaum/utils/packages/_packages.py,sha256=GzbJ0kxW_EQogXmY4vguRkUyad42cshFs7
 meerschaum/utils/packages/lazy_loader.py,sha256=VHnph3VozH29R4JnSSBfwtA5WKZYZQFT_GeQSShCnuc,2540
 meerschaum/utils/venv/_Venv.py,sha256=sBnlmxHdAh2bx8btfVoD79-H9-cYsv5lP02IIXkyECs,3553
 meerschaum/utils/venv/__init__.py,sha256=bLAWnllKDuE_z6bLk7gLh4mI3Sp1j5hsboTqPKOQq84,24361
-meerschaum-2.3.0rc5.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-2.3.0rc5.dist-info/METADATA,sha256=wPTucHTNGE47jFVclb44Q3LNaEAlNevWqZqadBld-aQ,24009
-meerschaum-2.3.0rc5.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-2.3.0rc5.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-meerschaum-2.3.0rc5.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-2.3.0rc5.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-2.3.0rc5.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-2.3.0rc5.dist-info/RECORD,,
+meerschaum-2.3.2.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-2.3.2.dist-info/METADATA,sha256=eHBptbYlyLDmNHOsptNJbIO2MrmtPUAXw3YxEhtUD6U,24006
+meerschaum-2.3.2.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-2.3.2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+meerschaum-2.3.2.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-2.3.2.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-2.3.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-2.3.2.dist-info/RECORD,,

meerschaum/jobs/_LocalExecutor.py

@@ -1,88 +0,0 @@
-#! /usr/bin/env python3
-# vim:fenc=utf-8
-
-"""
-Run jobs locally.
-"""
-
-from meerschaum.utils.typing import Dict, Any, List, SuccessTuple, Union
-from meerschaum.jobs import Job, Executor, make_executor
-from meerschaum.utils.daemon import Daemon, get_daemons
-from meerschaum._internal.entry import entry
-
-
-@make_executor
-class LocalExecutor(Executor):
-    """
-    Run jobs locally as Unix daemons.
-    """
-
-    def get_job_daemon(
-        self,
-        name: str,
-        #  sysargs: Opt
-        debug: bool = False,
-    ) -> Union[Daemon, None]:
-        """
-        Return a job's daemon if it exists.
-        """
-        try:
-            daemon = Daemon(name)
-        except Exception:
-            daemon = None
-
-        return daemon
-    
-    def get_daemon_syargs(self, name: str, debug: bool = False) -> Union[List[str], None]:
-        """
-        Return the list of sysargs from the job's daemon.
-        """
-        daemon = self.get_job_daemon(name, debug=debug)
-
-        if daemon is None:
-            return None
-
-        return daemon.properties.get('target', {}).get('args', [None])[0]
-
-    def get_job_exists(self, name: str, debug: bool = False) -> bool:
-        """
-        Return whether a job exists.
-        """
-        daemon = self.get_job_daemon(name, debug=debug)
-        if daemon is None:
-            return False
-    
-    def get_jobs(self) -> Dict[str, Job]:
-        """
-        Return a dictionary of names -> Jobs.
-        """
-
-    def create_job(self, name: str, sysargs: List[str], debug: bool = False) -> SuccessTuple:
-        """
-        Create a new job.
-        """
-
-    def start_job(self, name: str, debug: bool = False) -> SuccessTuple:
-        """
-        Start a job.
-        """
-
-    def stop_job(self, name: str, debug: bool = False) -> SuccessTuple:
-        """
-        Stop a job.
-        """
-
-    def pause_job(self, name: str, debug: bool = False) -> SuccessTuple:
-        """
-        Pause a job.
-        """
-
-    def delete_job(self, name: str, debug: bool = False) -> SuccessTuple:
-        """
-        Delete a job.
-        """
-
-    def get_logs(self, name: str, debug: bool = False) -> str:
-        """
-        Return a job's log output.
-        """