From 3734b110e33cac99074c1fde2b240395d0739cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= Date: Wed, 21 Sep 2022 02:34:04 +0300 Subject: Updated the examples --- examples/separate_worker/async_scheduler.py | 3 ++- examples/separate_worker/async_worker.py | 3 ++- examples/separate_worker/sync_scheduler.py | 3 ++- examples/separate_worker/sync_worker.py | 3 ++- examples/standalone/async_mysql.py | 4 ++-- examples/standalone/async_postgres.py | 4 ++-- examples/web/asgi_fastapi.py | 4 ++-- examples/web/asgi_noframework.py | 4 ++-- examples/web/asgi_starlette.py | 4 ++-- 9 files changed, 18 insertions(+), 14 deletions(-) diff --git a/examples/separate_worker/async_scheduler.py b/examples/separate_worker/async_scheduler.py index 2ac53c5..59c294c 100644 --- a/examples/separate_worker/async_scheduler.py +++ b/examples/separate_worker/async_scheduler.py @@ -19,6 +19,7 @@ import logging from example_tasks import tick from sqlalchemy.ext.asyncio import create_async_engine +from apscheduler import SchedulerRole from apscheduler.datastores.sqlalchemy import SQLAlchemyDataStore from apscheduler.eventbrokers.asyncpg import AsyncpgEventBroker from apscheduler.schedulers.async_ import AsyncScheduler @@ -37,7 +38,7 @@ async def main(): # event_broker = RedisEventBroker.from_url("redis://localhost") async with AsyncScheduler( - data_store, event_broker, process_jobs=False + data_store, event_broker, role=SchedulerRole.scheduler ) as scheduler: await scheduler.add_schedule(tick, IntervalTrigger(seconds=1), id="tick") await scheduler.run_until_stopped() diff --git a/examples/separate_worker/async_worker.py b/examples/separate_worker/async_worker.py index 51c51e9..a4e0ef9 100644 --- a/examples/separate_worker/async_worker.py +++ b/examples/separate_worker/async_worker.py @@ -18,6 +18,7 @@ import logging from sqlalchemy.ext.asyncio import create_async_engine +from apscheduler import SchedulerRole from apscheduler.datastores.sqlalchemy import SQLAlchemyDataStore from apscheduler.eventbrokers.asyncpg import AsyncpgEventBroker from apscheduler.schedulers.async_ import AsyncScheduler @@ -34,7 +35,7 @@ async def main(): # from apscheduler.eventbrokers.redis import RedisEventBroker # event_broker = RedisEventBroker.from_url("redis://localhost") - scheduler = AsyncScheduler(data_store, event_broker, process_schedules=False) + scheduler = AsyncScheduler(data_store, event_broker, role=SchedulerRole.worker) await scheduler.run_until_stopped() diff --git a/examples/separate_worker/sync_scheduler.py b/examples/separate_worker/sync_scheduler.py index 83d2d06..45d337d 100644 --- a/examples/separate_worker/sync_scheduler.py +++ b/examples/separate_worker/sync_scheduler.py @@ -18,6 +18,7 @@ import logging from example_tasks import tick from sqlalchemy.future import create_engine +from apscheduler import SchedulerRole from apscheduler.datastores.sqlalchemy import SQLAlchemyDataStore from apscheduler.eventbrokers.redis import RedisEventBroker from apscheduler.schedulers.sync import Scheduler @@ -32,6 +33,6 @@ event_broker = RedisEventBroker.from_url("redis://localhost") # from apscheduler.eventbrokers.mqtt import MQTTEventBroker # event_broker = MQTTEventBroker() -with Scheduler(data_store, event_broker, start_worker=False) as scheduler: +with Scheduler(data_store, event_broker, role=SchedulerRole.scheduler) as scheduler: scheduler.add_schedule(tick, IntervalTrigger(seconds=1), id="tick") scheduler.run_until_stopped() diff --git a/examples/separate_worker/sync_worker.py b/examples/separate_worker/sync_worker.py index 4329d02..24018ba 100644 --- a/examples/separate_worker/sync_worker.py +++ b/examples/separate_worker/sync_worker.py @@ -17,6 +17,7 @@ import logging from sqlalchemy.future import create_engine +from apscheduler import SchedulerRole from apscheduler.datastores.sqlalchemy import SQLAlchemyDataStore from apscheduler.eventbrokers.redis import RedisEventBroker from apscheduler.schedulers.sync import Scheduler @@ -30,5 +31,5 @@ event_broker = RedisEventBroker.from_url("redis://localhost") # from apscheduler.eventbrokers.mqtt import MQTTEventBroker # event_broker = MQTTEventBroker() -with Scheduler(data_store, event_broker, process_schedules=False) as scheduler: +with Scheduler(data_store, event_broker, role=SchedulerRole.worker) as scheduler: scheduler.run_until_stopped() diff --git a/examples/standalone/async_mysql.py b/examples/standalone/async_mysql.py index 6e8d801..809e7fb 100644 --- a/examples/standalone/async_mysql.py +++ b/examples/standalone/async_mysql.py @@ -16,7 +16,7 @@ from datetime import datetime from sqlalchemy.ext.asyncio import create_async_engine -from apscheduler.datastores.async_sqlalchemy import AsyncSQLAlchemyDataStore +from apscheduler.datastores.sqlalchemy import SQLAlchemyDataStore from apscheduler.schedulers.async_ import AsyncScheduler from apscheduler.triggers.interval import IntervalTrigger @@ -29,7 +29,7 @@ async def main(): engine = create_async_engine( "mysql+asyncmy://root:secret@localhost/testdb?charset=utf8mb4" ) - data_store = AsyncSQLAlchemyDataStore(engine) + data_store = SQLAlchemyDataStore(engine) async with AsyncScheduler(data_store) as scheduler: await scheduler.add_schedule(tick, IntervalTrigger(seconds=1), id="tick") await scheduler.run_until_stopped() diff --git a/examples/standalone/async_postgres.py b/examples/standalone/async_postgres.py index e9c519a..bd99873 100644 --- a/examples/standalone/async_postgres.py +++ b/examples/standalone/async_postgres.py @@ -16,7 +16,7 @@ from datetime import datetime from sqlalchemy.ext.asyncio import create_async_engine -from apscheduler.datastores.async_sqlalchemy import AsyncSQLAlchemyDataStore +from apscheduler.datastores.sqlalchemy import SQLAlchemyDataStore from apscheduler.schedulers.async_ import AsyncScheduler from apscheduler.triggers.interval import IntervalTrigger @@ -29,7 +29,7 @@ async def main(): engine = create_async_engine( "postgresql+asyncpg://postgres:secret@localhost/testdb" ) - data_store = AsyncSQLAlchemyDataStore(engine) + data_store = SQLAlchemyDataStore(engine) async with AsyncScheduler(data_store) as scheduler: await scheduler.add_schedule(tick, IntervalTrigger(seconds=1), id="tick") await scheduler.run_until_stopped() diff --git a/examples/web/asgi_fastapi.py b/examples/web/asgi_fastapi.py index 4a3872d..904ee19 100644 --- a/examples/web/asgi_fastapi.py +++ b/examples/web/asgi_fastapi.py @@ -20,7 +20,7 @@ from fastapi.responses import PlainTextResponse, Response from sqlalchemy.ext.asyncio import create_async_engine from starlette.types import ASGIApp, Receive, Scope, Send -from apscheduler.datastores.async_sqlalchemy import AsyncSQLAlchemyDataStore +from apscheduler.datastores.sqlalchemy import SQLAlchemyDataStore from apscheduler.eventbrokers.asyncpg import AsyncpgEventBroker from apscheduler.schedulers.async_ import AsyncScheduler from apscheduler.triggers.interval import IntervalTrigger @@ -56,7 +56,7 @@ async def root(request: Request) -> Response: engine = create_async_engine("postgresql+asyncpg://postgres:secret@localhost/testdb") -data_store = AsyncSQLAlchemyDataStore(engine) +data_store = SQLAlchemyDataStore(engine) event_broker = AsyncpgEventBroker.from_async_sqla_engine(engine) scheduler = AsyncScheduler(data_store, event_broker) middleware = [Middleware(SchedulerMiddleware, scheduler=scheduler)] diff --git a/examples/web/asgi_noframework.py b/examples/web/asgi_noframework.py index 4b57c30..8fc13cd 100644 --- a/examples/web/asgi_noframework.py +++ b/examples/web/asgi_noframework.py @@ -15,7 +15,7 @@ from datetime import datetime from sqlalchemy.ext.asyncio import create_async_engine -from apscheduler.datastores.async_sqlalchemy import AsyncSQLAlchemyDataStore +from apscheduler.datastores.sqlalchemy import SQLAlchemyDataStore from apscheduler.eventbrokers.asyncpg import AsyncpgEventBroker from apscheduler.schedulers.async_ import AsyncScheduler from apscheduler.triggers.interval import IntervalTrigger @@ -60,7 +60,7 @@ async def scheduler_middleware(scope, receive, send): engine = create_async_engine( "postgresql+asyncpg://postgres:secret@localhost/testdb" ) - data_store = AsyncSQLAlchemyDataStore(engine) + data_store = SQLAlchemyDataStore(engine) event_broker = AsyncpgEventBroker.from_async_sqla_engine(engine) async with AsyncScheduler(data_store, event_broker) as scheduler: await scheduler.add_schedule(tick, IntervalTrigger(seconds=1), id="tick") diff --git a/examples/web/asgi_starlette.py b/examples/web/asgi_starlette.py index aaac3ac..d4e48f6 100644 --- a/examples/web/asgi_starlette.py +++ b/examples/web/asgi_starlette.py @@ -21,7 +21,7 @@ from starlette.responses import PlainTextResponse, Response from starlette.routing import Route from starlette.types import ASGIApp, Receive, Scope, Send -from apscheduler.datastores.async_sqlalchemy import AsyncSQLAlchemyDataStore +from apscheduler.datastores.sqlalchemy import SQLAlchemyDataStore from apscheduler.eventbrokers.asyncpg import AsyncpgEventBroker from apscheduler.schedulers.async_ import AsyncScheduler from apscheduler.triggers.interval import IntervalTrigger @@ -57,7 +57,7 @@ async def root(request: Request) -> Response: engine = create_async_engine("postgresql+asyncpg://postgres:secret@localhost/testdb") -data_store = AsyncSQLAlchemyDataStore(engine) +data_store = SQLAlchemyDataStore(engine) event_broker = AsyncpgEventBroker.from_async_sqla_engine(engine) scheduler = AsyncScheduler(data_store, event_broker) routes = [Route("/", root)] -- cgit v1.2.1