schd 0.0.14__tar.gz → 0.0.16__tar.gz

{schd-0.0.14 → schd-0.0.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: schd
-Version: 0.0.14
+Version: 0.0.16
 Home-page: https://github.com/kevenli/schd
 License: ApacheV2
 Requires-Dist: apscheduler<4.0

schd-0.0.16/schd/__init__.py

@@ -0,0 +1 @@
+__version__ = '0.0.16'

{schd-0.0.14 → schd-0.0.16}/schd/cmds/jobs.py

@@ -12,8 +12,5 @@ class JobsCommand(CommandBase):
 
     def run(self, args):
         config = read_config(config_file=args.config)
-        for job_name, job_config in config['jobs'].items():
-            job_class_name = job_config.pop('class')
-            job_cron = job_config.pop('cron')
-            # print(f'{job_name} : {job_class_name} {job_cron}')
+        for job_name, _ in config.jobs.items():
             print(job_name)

{schd-0.0.14 → schd-0.0.16}/schd/cmds/run.py

@@ -1,5 +1,4 @@
 import logging
-import yaml
 from schd.cmds.base import CommandBase
 from schd.scheduler import build_job, read_config, JobContext
 
@@ -7,11 +6,9 @@ from schd.scheduler import build_job, read_config, JobContext
 def run_job(config_file, job_name):
     config = read_config(config_file)
 
-    job_config = config['jobs'][job_name]
+    job_config = config.jobs[job_name]
 
-    job_class_name = job_config.pop('class')
-    job_cron = job_config.pop('cron')
-    job = build_job(job_name, job_class_name, job_config)
+    job = build_job(job_name, job_config.cls, job_config)
     job_context = JobContext(job_name)
     job_context.output_to_console = True
     job(context=job_context)

{schd-0.0.14 → schd-0.0.16}/schd/schedulers/remote.py

@@ -76,8 +76,8 @@ class RemoteApiClient:
                 data.add_field('logfile', f, filename=os.path.basename(logfile_path), content_type='application/octet-stream')
 
                 async with session.put(upload_url, data=data) as resp:
-                    print("Status:", resp.status)
-                    print("Response:", await resp.text())
+                    logger.info("Status: %d", resp.status)
+                    logger.info("Response: %s", await resp.text())
 
 
 class RemoteScheduler:
@@ -107,7 +107,7 @@ class RemoteScheduler:
             logger.info('start_main_loop ')
             try:
                 async for event in self.client.subscribe_worker_eventstream(self._worker_name):
-                    print(event)
+                    logger.info('got event, %s', event)
                     job_name = event['data']['job_name']
                     instance_id = event['data']['id']
                     _, queue_name = self._jobs[job_name]
@@ -146,12 +146,15 @@ class RemoteScheduler:
         logger.info('starting job %s@%d', job_name, instance_id)
         await self.client.update_job_instance(self._worker_name, job_name, instance_id, status='RUNNING')
         try:
+            def execute_job():
+                with redirect_stdout(text_stream):
+                    job_result = job.execute(context)
+                    return job_result
+            
             loop = asyncio.get_running_loop()
-            with redirect_stdout(text_stream):
-                # job_result = job.execute(context)
-                job_result = await loop.run_in_executor(
-                    None, job.execute, context
-                )
+            job_result = await loop.run_in_executor(
+                None, execute_job
+            )
 
             if job_result is None:
                 ret_code = 0

{schd-0.0.14 → schd-0.0.16}/schd.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: schd
-Version: 0.0.14
+Version: 0.0.16
 Home-page: https://github.com/kevenli/schd
 License: ApacheV2
 Requires-Dist: apscheduler<4.0

{schd-0.0.14 → schd-0.0.16}/setup.py

@@ -7,7 +7,7 @@ def read_requirements():
 
 setup(
     name="schd",
-    version="0.0.14",
+    version="0.0.16",
     url="https://github.com/kevenli/schd",
     packages=find_packages(exclude=('tests', 'tests.*')),
     install_requires=['apscheduler<4.0', 'pyaml', 'aiohttp'],

schd-0.0.14/schd/__init__.py

@@ -1 +0,0 @@
-__version__ = '0.0.14'