schd 0.0.13__tar.gz → 0.0.15__tar.gz

{schd-0.0.13 → schd-0.0.15}/PKG-INFO

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

schd-0.0.15/schd/__init__.py

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

{schd-0.0.13 → schd-0.0.15}/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]
@@ -143,10 +143,18 @@ class RemoteScheduler:
         text_stream = io.TextIOWrapper(output_stream, encoding='utf-8')
 
         context = JobContext(job_name=job_name, stdout=text_stream)
+        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:
-            with redirect_stdout(text_stream):
-                job_result = job.execute(context)
+            def execute_job():
+                with redirect_stdout(text_stream):
+                    job_result = job.execute(context)
+                    return job_result
+            
+            loop = asyncio.get_running_loop()
+            job_result = await loop.run_in_executor(
+                None, execute_job
+            )
 
             if job_result is None:
                 ret_code = 0

{schd-0.0.13 → schd-0.0.15}/schd.egg-info/PKG-INFO

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

{schd-0.0.13 → schd-0.0.15}/setup.py

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

schd-0.0.13/schd/__init__.py

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