socket.d 2.4.10.7__tar.gz → 2.4.11.1__tar.gz

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: socket.d
-Version: 2.4.10.7
+Version: 2.4.11.1
 Summary: @noear/socket.d python project
 Home-page: https://socketd.noear.org/
 Author: noear,bai

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup,find_packages
 
 setup(
     name='socket.d',
-    version='2.4.10.7',
+    version='2.4.11.1',
     description='@noear/socket.d python project',
     author='noear,bai',
     url='https://socketd.noear.org/',

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socket.d.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: socket.d
-Version: 2.4.10.7
+Version: 2.4.11.1
 Summary: @noear/socket.d python project
 Home-page: https://socketd.noear.org/
 Author: noear,bai

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socket.d.egg-info/SOURCES.txt

@@ -80,8 +80,9 @@ socketd/transport/core/impl/SessionDefault.py
 socketd/transport/core/impl/__init__.py
 socketd/transport/core/listener/EventListener.py
 socketd/transport/core/listener/PathListener.py
-socketd/transport/core/listener/PathMapper.py
 socketd/transport/core/listener/PipelineListener.py
+socketd/transport/core/listener/RouteSelector.py
+socketd/transport/core/listener/RouteSelectorDefault.py
 socketd/transport/core/listener/SimpleListener.py
 socketd/transport/core/listener/__init__.py
 socketd/transport/server/Server.py
@@ -92,19 +93,25 @@ socketd/transport/server/__init__.py
 socketd/transport/stream/RequestStream.py
 socketd/transport/stream/SendStream.py
 socketd/transport/stream/Stream.py
-socketd/transport/stream/StreamBase.py
 socketd/transport/stream/StreamManger.py
 socketd/transport/stream/StreamMangerDefault.py
 socketd/transport/stream/SubscribeStream.py
 socketd/transport/stream/__init__.py
+socketd/transport/stream/impl/RequestStreamImpl.py
+socketd/transport/stream/impl/SendStreamImpl.py
+socketd/transport/stream/impl/StreamBase.py
+socketd/transport/stream/impl/SubscribeStreamImpl.py
+socketd/transport/stream/impl/__init__.py
 socketd/transport/utils/AsyncUtils.py
 socketd/transport/utils/CompletableFuture.py
-socketd/transport/utils/StrUtils.py
 socketd/transport/utils/__init__.py
 socketd/transport/utils/async_api/AtomicRefer.py
 socketd/transport/utils/async_api/__init__.py
 socketd/transport/utils/sync_api/AtomicRefer.py
 socketd/transport/utils/sync_api/__init__.py
+socketd/utils/RunUtils.py
+socketd/utils/StrUtils.py
+socketd/utils/__init__.py
 socketd_aio_tcp/TCPAIOServer.py
 socketd_aio_tcp/TCPStreamIO.py
 socketd_aio_tcp/TcpAIOChannelAssistant.py

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/SocketD.py

@@ -14,7 +14,7 @@ from socketd_aio_tcp.TcpAioProvider import TcpAioProvider
 
 
 def version() -> str:
-    return "2.4.10"
+    return "2.4.11"
 
 
 def protocol_version() -> str:
@@ -24,65 +24,11 @@ def protocol_version() -> str:
 client_factory_map: Dict[str, ClientProvider] = {}
 server_factory_map: Dict[str, ServerProvider] = {}
 
-def create_server(schemaOrConfig: str | ServerConfig) -> Server:
-    Asserts.assert_null("schemaOrConfig", schemaOrConfig)
-    config:ServerConfig
-
-    if isinstance(schemaOrConfig, str):
-        config = ServerConfig(schemaOrConfig)
-    else:
-        config = schemaOrConfig
-
-    server = create_server_or_null(config)
-
-    if server is None:
-        raise RuntimeError(f"No socketd server providers were found: {config.get_schema()}")
-    else:
-        return server
-
-def create_server_or_null(config: ServerConfig) -> Server:
-    factory = server_factory_map.get(config.get_schema())
-
-    if factory is None:
-        return None
-    else:
-        return factory.create_server(config)
-
-
-def create_client(urlOrConfig: str | ClientConfig) -> Client:
-    Asserts.assert_null("urlOrConfig", urlOrConfig)
-    config:ClientConfig
-
-    if isinstance(urlOrConfig, str):
-        config = ClientConfig(urlOrConfig)
-    else:
-        config = urlOrConfig
-
-    client = create_client_or_null(config)
-
-    if client is None:
-        raise RuntimeError(f"No socketd client providers were found: {config.get_schema()}")
-    else:
-        return client
-
-def create_client_or_null(config: ClientConfig) -> Client:
-    Asserts.assert_null("config", config)
-
-    factory = client_factory_map.get(config.get_schema())
-    if factory is None:
-        return None
-    else:
-        return factory.create_client(config)
-
-
-def create_cluster_client(*urls):
-    return ClusterClient(*urls)
-
-
 def load_factories(factories: list[ClientProvider | ServerProvider], factory_map: Dict[str, object]) -> None:
     for factory in factories:
         for schema in factory.schema():
             factory_map[schema] = factory
+
 def create_server(schemaOrConfig: str | ServerConfig) -> Server:
     Asserts.assert_null("schemaOrConfig", schemaOrConfig)
     config:ServerConfig
@@ -124,7 +70,7 @@ def create_client(urlOrConfig: str | ClientConfig) -> Client:
     else:
         return client
 
-def create_client_or_null(config: ClientConfig) -> Client:
+def create_client_or_null(config: ClientConfig) -> Client | None:
     Asserts.assert_null("config", config)
 
     factory = client_factory_map.get(config.get_schema())
@@ -134,7 +80,7 @@ def create_client_or_null(config: ClientConfig) -> Client:
         return factory.create_client(config)
 
 
-def create_cluster_client(*urls):
+def create_cluster_client(*urls) -> Client:
     return ClusterClient(*urls)
 
 

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/broker/BrokerListenerBase.py

@@ -6,7 +6,7 @@ from socketd.transport.core.EntityMetas import EntityMetas
 from socketd.transport.core.Listener import Listener
 from socketd.transport.core.Message import Message
 from socketd.transport.core.Session import Session
-from socketd.transport.utils.StrUtils import StrUtils
+from socketd.utils.StrUtils import StrUtils
 
 
 # 经纪人监听器基类（实现玩家封闭管理）

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/cluster/ClusterClientSession.py

@@ -5,7 +5,7 @@ from socketd.transport.core import Entity
 from socketd.transport.stream.RequestStream import RequestStream
 from socketd.transport.stream.SendStream import SendStream
 from socketd.transport.stream.SubscribeStream import SubscribeStream
-from socketd.transport.utils.StrUtils import StrUtils
+from socketd.utils.StrUtils import StrUtils
 
 
 class ClusterClientSession(ClientSession):
@@ -45,20 +45,20 @@ class ClusterClientSession(ClientSession):
     def session_id(self) -> str:
         return self.__sessionId
 
-    async def send(self, event: str, content: Entity) -> SendStream:
+    def send(self, event: str, content: Entity) -> SendStream:
         sender = self.get_session_any(None)
 
-        return await sender.send(event, content)
+        return sender.send(event, content)
 
-    async def send_and_request(self, event: str, content: Entity, timeout: int) -> RequestStream:
+    def send_and_request(self, event: str, content: Entity, timeout: int) -> RequestStream:
         sender = self.get_session_any(None)
 
-        return await sender.send_and_request(event, content, timeout)
+        return sender.send_and_request(event, content, timeout)
 
-    async def send_and_subscribe(self, event: str, content: Entity, timeout: int = 0) -> SubscribeStream:
+    def send_and_subscribe(self, event: str, content: Entity, timeout: int = 0) -> SubscribeStream:
         sender = self.get_session_any(None)
 
-        return await sender.send_and_subscribe(event, content, timeout)
+        return sender.send_and_subscribe(event, content, timeout)
 
     async def preclose(self):
         for session in self.__sessionSet:

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/cluster/LoadBalancer.py

@@ -2,7 +2,7 @@ from threading import RLock
 from typing import List
 
 from socketd.transport.client.ClientSession import ClientSession
-from socketd.transport.utils.StrUtils import StrUtils
+from socketd.utils.StrUtils import StrUtils
 
 
 class LoadBalancer:

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/transport/client/Client.py

@@ -33,11 +33,11 @@ class Client(ABC):
 
     # 打开会话
     @abstractmethod
-    def open(self) -> Session | Future: ...
+    async def open(self) -> Session: ...
 
     # 打开会话或出异常（即要求第一次是连接成功的）
     @abstractmethod
-    def open_or_throw(self) -> Session | Future: ...
+    async def open_or_throw(self) -> Session: ...
 
 
 class ClientInternal(Client):

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/transport/client/ClientBase.py

@@ -86,11 +86,11 @@ class ClientBase(ClientInternal, ABC):
 
         return clientChannel.get_session()
 
-    def open(self) -> Awaitable[Session]:
-        return self._open_do(False)
+    async def open(self) -> Session:
+        return await self._open_do(False)
 
-    def open_or_throw(self) -> Awaitable[Session]:
-        return self._open_do(True)
+    async def open_or_throw(self) -> Session:
+        return await self._open_do(True)
 
     @abstractmethod
     def create_connector(self):

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/transport/client/ClientChannel.py

@@ -8,7 +8,7 @@ from socketd.transport.core.ChannelInternal import ChannelInternal
 from socketd.transport.core.Costants import Constants
 from socketd.transport.core.impl.LogConfig import log
 from socketd.transport.core.impl.SessionDefault import SessionDefault
-from socketd.transport.stream.StreamManger import StreamInternal
+from socketd.transport.stream.Stream import StreamInternal
 from socketd.transport.core.impl.ChannelBase import ChannelBase
 from socketd.transport.client.ClientConnector import ClientConnector
 

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/transport/client/ClientSession.py

@@ -21,20 +21,17 @@ class ClientSession:
         ...
 
     @abc.abstractmethod
-    async def send(self, event: str, content: Entity) -> SendStream:
+    def send(self, event: str, content: Entity) -> SendStream:
         ...
 
     @abc.abstractmethod
-    async def send_and_request(self, event: str, content: Entity, timeout: int = 0) -> RequestStream:
+    def send_and_request(self, event: str, content: Entity, timeout: int = 0) -> RequestStream:
         ...
 
     @abc.abstractmethod
-    async def send_and_subscribe(self, event: str, content: Entity, timeout: int = 0) -> SubscribeStream:
+    def send_and_subscribe(self, event: str, content: Entity, timeout: int = 0) -> SubscribeStream:
         ...
 
-    async def close_starting(self):
-        self.preclose()
-
     @abc.abstractmethod
     async def preclose(self):
         ...

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/transport/core/Channel.py

@@ -9,7 +9,7 @@ from socketd.transport.core.Frame import Frame
 from socketd.transport.core.Message import Message
 from abc import abstractmethod, ABC
 
-from socketd.transport.stream.StreamManger import StreamInternal
+from socketd.transport.stream.Stream import StreamInternal
 
 
 class Channel(ABC):

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/transport/core/Codec.py

@@ -40,6 +40,9 @@ class CodecWriter(ABC):
     @abstractmethod
     def put_int(self, _num: int): ...
 
+    @abstractmethod
+    def put_char(self, _char: int): ...
+
     @abstractmethod
     def flush(self): ...
 

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/transport/core/FragmentHandler.py

@@ -3,7 +3,7 @@ from typing import Callable
 
 from socketd.transport.core.Frame import Frame
 from socketd.transport.core.Message import MessageInternal
-from socketd.transport.stream.StreamManger import StreamInternal
+from socketd.transport.stream.Stream import StreamInternal
 from socketd.transport.core import Channel
 
 

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/transport/core/HandshakeDefault.py

@@ -3,7 +3,7 @@ from urllib.parse import urlparse, parse_qsl
 
 from socketd.transport.core.EntityMetas import EntityMetas
 from socketd.transport.core.Message import Message, MessageInternal
-from socketd.transport.utils.StrUtils import StrUtils
+from socketd.utils.StrUtils import StrUtils
 
 
 class Handshake:

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/transport/core/IdGenerator.py

@@ -1,6 +1,6 @@
 from typing import Callable
 
-from socketd.transport.utils.StrUtils import StrUtils
+from socketd.utils.StrUtils import StrUtils
 
 IdGenerator = Callable[[None], str]
 

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/transport/core/Listener.py

@@ -18,5 +18,5 @@ class Listener(abc.ABC):
         pass
 
     @abc.abstractmethod
-    def on_error(self, session: Session, error):
+    async def on_error(self, session: Session, error):
         pass

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/transport/core/Processor.py

@@ -1,5 +1,6 @@
 from abc import ABC, abstractmethod
 
+from socketd.transport.core import Listener
 from socketd.transport.core.Channel import Channel
 from socketd.transport.core.ChannelInternal import ChannelInternal
 from socketd.transport.core.Frame import Frame
@@ -9,7 +10,7 @@ from socketd.transport.core.Message import Message
 class Processor(ABC):
 
     @abstractmethod
-    def set_listener(self, listener):
+    def set_listener(self, listener: Listener) -> None:
         pass
 
     @abstractmethod
@@ -31,3 +32,6 @@ class Processor(ABC):
     @abstractmethod
     def on_error(self, channel: ChannelInternal, error):
         pass
+    @abstractmethod
+    def do_close_notice(self, channel: ChannelInternal):
+        pass

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/transport/core/codec/Buffer.py

@@ -21,16 +21,23 @@ class Buffer(BytesIO):
         rem = self.__size - self.tell()
         return rem if rem > 0 else 0
 
-    def limit(self):
-        return self.__limit
+    def position(self) -> int:
+        ...
 
     def size(self):
         return self.__size
 
+    def limit(self):
+        return self.__limit
+
     def put_int(self, num: int):
         super().write(num.to_bytes(length=4, byteorder='big', signed=False))
         self.__size += 4
 
+    def put_char(self, char:int):
+        super().write(char.to_bytes(length=2, byteorder='big', signed=False))
+        self.__size += 2
+
     def get_int(self):
         return int.from_bytes(self.read1(4), byteorder='big', signed=False)
 

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/transport/core/codec/ByteBufferCodecReader.py

@@ -13,7 +13,7 @@ class ByteBufferCodecReader(CodecReader):
         return self.__buffer.getvalue()
 
     def get_int(self) -> int:
-        return int.from_bytes(self.__buffer.read1(4), byteorder='little', signed=False)
+        return int.from_bytes(self.__buffer.read1(4), byteorder='big', signed=False)
 
     def skip_bytes(self, size):
         self.__buffer.seek(self.__buffer.tell() + size)

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/transport/core/codec/ByteBufferCodecWriter.py

@@ -12,7 +12,10 @@ class ByteBufferCodecWriter(CodecWriter):
         self.__buffer.write(_bytes)
 
     def put_int(self, _num: int):
-        self.__buffer.write(_num.to_bytes(length=4, byteorder='little', signed=False))
+        self.__buffer.put_int(_num)
+
+    def put_char(self, _char: int):
+        self.__buffer.put_char(_char)
 
     def flush(self):
         self.__buffer.flush()

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/transport/core/codec/CodecDefault.py

@@ -55,15 +55,15 @@ class CodecDefault(Codec):
 
             # sid
             target.put_bytes(sidB)
-            target.put_bytes(b'\n')
+            target.put_char(10) #'\n'
 
             # event
             target.put_bytes(event)
-            target.put_bytes(b'\n')
+            target.put_char(10)
 
             # metaString
             target.put_bytes(metaStringB)
-            target.put_bytes(b'\n')
+            target.put_char(10)
 
             # _data
             if frame.message().entity().data() is not None:
@@ -73,25 +73,30 @@ class CodecDefault(Codec):
             return target
 
     def read(self, _reader: CodecReader) -> Frame | None:
-        len0 = _reader.get_int()
+        frameSize = _reader.get_int()
 
-        if len0 > (_reader.remaining() + 4):
+        if frameSize > (_reader.remaining() + 4):
             return None
 
         flag = _reader.get_int()  # 取前一位数据
 
-        if len0 == 8:
+        if frameSize == 8:
             # len + flag
             return Frame(Flags.of(flag), None)
         else:
             metaBufSize = min(Constants.MAX_SIZE_META_STRING, _reader.remaining())
+
             # 1. decode sid and event
-            by = Buffer(limit=metaBufSize)
-            sid = self.decodeString(_reader, by, Constants.MAX_SIZE_SID)
-            event = self.decodeString(_reader, by, Constants.MAX_SIZE_EVENT)
-            metaString = self.decodeString(_reader, by, Constants.MAX_SIZE_META_STRING)
+            buf = Buffer(limit=metaBufSize)
+
+            sid = self.decodeString(_reader, buf, Constants.MAX_SIZE_SID)
+
+            event = self.decodeString(_reader, buf, Constants.MAX_SIZE_EVENT)
+
+            metaString = self.decodeString(_reader, buf, Constants.MAX_SIZE_META_STRING)
+
             # 2. decode body
-            dataRealSize = len0 - _reader.position()
+            dataRealSize = frameSize - _reader.position()
             data: Optional[bytearray] = None
             if dataRealSize > Constants.MAX_SIZE_DATA:
                 # exceeded the limit, read and discard the bytes
@@ -102,15 +107,18 @@ class CodecDefault(Codec):
             else:
                 data = bytearray(_reader.get_buffer().read(dataRealSize))
 
-            message = MessageBuilder().flag(Flags.of(flag)).sid(sid).event(event).entity(
-                EntityDefault().meta_string_set(metaString).data_set(data)
-            ).build()
-            by.close()
+            message = (MessageBuilder()
+                       .flag(Flags.of(flag))
+                       .sid(sid)
+                       .event(event)
+                       .entity(EntityDefault().data_set(data).meta_string_set(metaString))
+                       .build())
+            buf.close()
             _reader.close()
             return Frame(message.flag(), message)
 
     def decodeString(self, reader: CodecReader, buf: Buffer, maxLen: int) -> str:
-        b = bytearray(reader.get_buffer().readline(maxLen).replace(b'\n', b''))
+        b = bytearray(reader.get_buffer().readline(maxLen).replace(b'\x00\n', b''))
         if buf.limit() < 1:
             return ""
         return b.decode(self.config.get_charset())

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/transport/core/fragment/FragmentAggregatorDefault.py

@@ -9,7 +9,7 @@ from socketd.exception.SocketDExecption import SocketDException
 
 from .FragmentHolder import FragmentHolder
 from ..entity.MessageBuilder import MessageBuilder
-from ...utils.StrUtils import StrUtils
+from socketd.utils.StrUtils import StrUtils
 
 
 class FragmentAggregatorDefault(FragmentAggregator):
@@ -43,14 +43,18 @@ class FragmentAggregatorDefault(FragmentAggregator):
     def get(self) -> Frame:
         self.__fragmentHolders.sort(key=lambda x: x.index)
 
-        byte: BytesIO = BytesIO()
+        dataBuffer: BytesIO = BytesIO()
 
         for fragment in self.__fragmentHolders:
-            byte.write(fragment.message.data().getvalue())
+            dataBuffer.write(fragment.message.data().getvalue())
+
+        entity = EntityDefault().meta_map_put(self.__main.meta_map()).data_set(dataBuffer)
+        entity.meta_map().pop(EntityMetas.META_DATA_FRAGMENT_IDX)
 
         return Frame(self.__main.flag(),
                      MessageBuilder()
                      .flag(self.__main.flag())
                      .sid(self.__main.sid())
-                     .entity(EntityDefault().meta_map_put(self.__main.entity().meta_map())).build()
-                     )
+                     .event(self.__main.event())
+                     .entity(entity)
+                     .build())

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/transport/core/fragment/FragmentHandlerBase.py

@@ -10,7 +10,7 @@ from socketd.transport.core.entity.EntityDefault import EntityDefault
 from socketd.transport.core.FragmentAggregator import FragmentAggregator
 from socketd.transport.core.fragment.FragmentAggregatorDefault import FragmentAggregatorDefault
 from socketd.transport.core.FragmentHandler import FragmentHandler
-from socketd.transport.stream.StreamManger import StreamInternal
+from socketd.transport.stream.Stream import StreamInternal
 
 
 class FragmentHandlerBase(FragmentHandler, ABC):

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/transport/core/impl/ChannelDefault.py

@@ -9,8 +9,8 @@ from socketd.transport.core.ChannelSupporter import ChannelSupporter
 from socketd.transport.core.Message import MessageInternal, Message
 from socketd.transport.core.entity.MessageBuilder import MessageBuilder
 from socketd.transport.core.impl.LogConfig import log
-from socketd.transport.stream.Stream import Stream
-from socketd.transport.stream.StreamManger import StreamManger, StreamInternal
+from socketd.transport.stream.Stream import Stream, StreamInternal
+from socketd.transport.stream.StreamManger import StreamManger
 from socketd.transport.core.impl.ChannelBase import ChannelBase
 from socketd.transport.core.Costants import Constants
 from socketd.transport.core.Flags import Flags
@@ -19,6 +19,7 @@ from socketd.transport.core.Session import Session
 from socketd.transport.core.impl.SessionDefault import SessionDefault
 from socketd.transport.core.Frame import Frame
 from socketd.transport.utils.CompletableFuture import CompletableFuture
+from socketd.utils.RunUtils import RunUtils
 
 S = TypeVar("S")
 
@@ -38,6 +39,7 @@ class ChannelDefault(ChannelBase, ChannelInternal):
         self._session: Optional[Session] = None
         self._liveTime: Optional[float] = None
         self._closeCode: int = 0
+        self._isCloseNotified = False;
 
     def is_valid(self) -> bool:
         return self.is_closed() == 0 and self._assistant.is_valid(self._source)
@@ -160,13 +162,23 @@ class ChannelDefault(ChannelBase, ChannelInternal):
         try:
             self._closeCode = code
 
-            await super().close(code)
+            await RunUtils.waitTry(super().close(code))
 
             if code > Constants.CLOSE1000_PROTOCOL_CLOSE_STARTING:
                 if self._assistant.is_valid(self._source):
                     # 如果有效且非预关闭，则尝试关闭源
-                    await self._assistant.close(self._source)
+                    await RunUtils.waitTry(self._assistant.close(self._source))
                     log.debug(f"{self.get_config().get_role_name()} channel closed, sessionId={self.get_session().session_id()}")
         except Exception as e:
             log.warning(f"{self.get_config().get_role_name()} channel close error, "
                         f"sessionId={self.get_session().session_id()} : {e}")
+
+        if code > Constants.CLOSE1000_PROTOCOL_CLOSE_STARTING:
+            self.on_close_do()
+
+
+    def on_close_do(self):
+        if self._isCloseNotified == False:
+            self._isCloseNotified = True
+            self._processor.do_close_notice(self)
+

{socket.d-2.4.10.7 → socket.d-2.4.11.1}/socketd/transport/core/impl/LogConfig.py

@@ -1,13 +1,12 @@
 # 异步日志框架
-from loguru import logger as _logger
-
+import sys
 import logging
 
+from loguru import logger as _logger
+
 # socket.d 默认
 logger = logging.getLogger("socketD")
 # 异步默认日志
 logging.getLogger("asyncio").setLevel(logging.WARNING)
-# 少用默认logging ，因为他会阻塞你的线程
-# 删除原本的处理器
-_logger.remove()
+# 日志用这个
 log = _logger.opt(colors=True)