diff --git a/lightbus/bus.py b/lightbus/bus.py index c8e80cf1..8816db38 100644 --- a/lightbus/bus.py +++ b/lightbus/bus.py @@ -1,35 +1,31 @@ -from inspect import isawaitable - -import os import asyncio import contextlib import inspect import logging +import os import signal import time from asyncio.futures import CancelledError -from typing import Optional, List, Sequence, Tuple, Union, Mapping +from inspect import isawaitable +from typing import Optional, List, Tuple, Union, Mapping -from lightbus import configure_logging -from lightbus.config import Config -from lightbus.schema import Schema from lightbus.api import registry, Api +from lightbus.config import Config from lightbus.exceptions import InvalidEventArguments, InvalidBusNodeConfiguration, UnknownApi, EventNotFound, \ InvalidEventListener, SuddenDeathException, LightbusTimeout, LightbusServerError, NoApisToListenOn, InvalidName, \ - InvalidParameters, ApisMustUseSameTransport, OnlyAvailableOnRootNode + InvalidParameters, OnlyAvailableOnRootNode from lightbus.internal_apis import LightbusStateApi, LightbusMetricsApi from lightbus.log import LBullets, L, Bold from lightbus.message import RpcMessage, ResultMessage, EventMessage, Message from lightbus.plugins import autoload_plugins, plugin_hook, manually_set_plugins +from lightbus.schema import Schema from lightbus.schema.schema import _parameter_names -from lightbus.transports import RpcTransport, ResultTransport, EventTransport, RedisRpcTransport, \ - RedisResultTransport, RedisEventTransport +from lightbus.transports import RpcTransport, ResultTransport, EventTransport from lightbus.transports.base import SchemaTransport, TransportRegistry -from lightbus.transports.redis import RedisSchemaTransport +from lightbus.utilities.async import handle_aio_exceptions, block, get_event_loop, cancel from lightbus.utilities.config import random_name from lightbus.utilities.frozendict import frozendict from lightbus.utilities.human import human_time -from lightbus.utilities.async import handle_aio_exceptions, block, get_event_loop, cancel __all__ = ['BusClient', 'BusNode', 'create'] diff --git a/lightbus/transports/redis.py b/lightbus/transports/redis.py index 9eda352e..2653d1ab 100644 --- a/lightbus/transports/redis.py +++ b/lightbus/transports/redis.py @@ -1,20 +1,15 @@ +import asyncio import json import logging import time +from collections import OrderedDict from datetime import datetime -from functools import partial -from random import random -from typing import Sequence, Optional, Union, Generator, Dict, NamedTuple, Mapping -from urllib.parse import urlparse +from typing import Sequence, Optional, Union, Generator, Dict, Mapping import aioredis -import asyncio - -import os -from aioredis import Redis, RedisError, ReplyError +from aioredis import Redis, ReplyError from aioredis.pool import ConnectionsPool from aioredis.util import decode -from collections import OrderedDict from lightbus.api import Api from lightbus.exceptions import LightbusException, LightbusShutdownInProgress