schd 0.1.0__tar.gz → 0.1.1__tar.gz

{schd-0.1.0 → schd-0.1.1}/PKG-INFO

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

schd-0.1.1/schd/__init__.py

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

{schd-0.1.0 → schd-0.1.1}/schd/cmds/daemon.py

@@ -8,12 +8,10 @@ from schd import __version__  as schd_version
 
 class DaemonCommand(CommandBase):
     def add_arguments(self, parser):
-        parser.add_argument('--config', '-c')
         parser.add_argument('--logfile')
 
-    def run(self, args):
-        config_file = args.config
-        print(f'starting schd, {schd_version}, config_file={config_file}')
+    def run(self, args, config):
+        print(f'starting schd, {schd_version}')
 
         if args.logfile:
             log_stream = open(args.logfile, 'a', encoding='utf8')
@@ -23,4 +21,4 @@ class DaemonCommand(CommandBase):
             log_stream = sys.stdout
 
         logging.basicConfig(level=logging.INFO, format='%(asctime)s %(name)s %(levelname)s %(message)s', datefmt='%Y-%m-%d %H:%M:%S', stream=log_stream)
-        asyncio.run(run_daemon(config_file))
+        asyncio.run(run_daemon(config))

{schd-0.1.0 → schd-0.1.1}/schd/scheduler.py

@@ -280,8 +280,7 @@ def build_scheduler(config:SchdConfig):
     return scheduler
 
 
-async def run_daemon(config_file=None):
-    config = read_config(config_file=config_file)
+async def run_daemon(config):
     scheduler = build_scheduler(config)
     await scheduler.init()
 
@@ -329,11 +328,12 @@ async def main():
     parser.add_argument('--logfile')
     parser.add_argument('--config', '-c')
     args = parser.parse_args()
-    config_file = args.config
 
     logging.basicConfig(level=logging.DEBUG)
 
-    print(f'starting schd, {schd_version}, config_file={config_file}')
+    config = read_config(args.config)
+    print(f'starting schd, {schd_version}')
+    
 
     if args.logfile:
         log_stream = open(args.logfile, 'a', encoding='utf8')
@@ -343,7 +343,7 @@ async def main():
         log_stream = sys.stdout
 
     logging.basicConfig(level=logging.INFO, format='%(asctime)s %(name)s - %(levelname)s %(message)s', datefmt='%Y-%m-%d %H:%M:%S', stream=log_stream)
-    await run_daemon(config_file)
+    await run_daemon(config)
 
 
 if __name__ == '__main__':

{schd-0.1.0 → schd-0.1.1}/schd.egg-info/PKG-INFO

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

{schd-0.1.0 → schd-0.1.1}/setup.py

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

schd-0.1.0/schd/__init__.py

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