sycommon-python-lib 0.2.1b7__tar.gz → 0.2.1b8__tar.gz

{sycommon_python_lib-0.2.1b7 → sycommon_python_lib-0.2.1b8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.1b7
+Version: 0.2.1b8
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{sycommon_python_lib-0.2.1b7 → sycommon_python_lib-0.2.1b8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.2.1b7"
+version = "0.2.1b8"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"

{sycommon_python_lib-0.2.1b7 → sycommon_python_lib-0.2.1b8}/src/sycommon/logging/kafka_log.py

@@ -38,7 +38,7 @@ class KafkaSink:
         bootstrap_servers = common.get("log", {}).get(
             "kafka", {}).get("servers", None)
 
-        self._producer = KafkaProducer(
+        self._producer_obj = KafkaProducer(
             bootstrap_servers=bootstrap_servers,
             value_serializer=lambda v: json.dumps(
                 v, ensure_ascii=False).encode('utf-8'),
@@ -51,6 +51,7 @@ class KafkaSink:
             linger_ms=5,
             buffer_memory=33554432,
         )
+        self._producer = self._producer_obj
 
         # 缓存主机信息，避免每次日志写入都做 DNS 解析
         try:
@@ -65,6 +66,10 @@ class KafkaSink:
         message 参数实际上是 loguru.Message 对象，可以通过 message.record 获取所有字段。
         """
         try:
+            # producer 已关闭则跳过
+            if self._producer is None:
+                return
+
             # 1. 获取原始日志记录
             record = message.record
 
@@ -151,8 +156,8 @@ class KafkaSink:
             future = self._producer.send("shengye-json-log", log_entry)
             future.add_errback(lambda e: print(f"Kafka send failed: {e}"))
 
-        except Exception as e:
-            print(f"KafkaSink Error: {e}")
+        except Exception:
+            pass
 
     def flush(self):
         if self._producer:
@@ -161,13 +166,14 @@ class KafkaSink:
     def close(self):
         """关闭 KafkaProducer，释放连接池资源"""
         if self._producer:
+            self._producer = None
             try:
-                self._producer.flush(timeout=5)
-                self._producer.close(timeout=10)
-            except Exception as e:
-                print(f"KafkaSink close error: {e}")
-            finally:
-                self._producer = None
+                self._producer_obj.flush(timeout=5)
+                self._producer_obj.close(timeout=10)
+            except KeyboardInterrupt:
+                pass
+            except Exception:
+                pass
 
 
 class KafkaLogger(metaclass=SingletonMeta):
@@ -220,9 +226,15 @@ class KafkaLogger(metaclass=SingletonMeta):
 
     @staticmethod
     def close():
-        if KafkaLogger._sink_instance:
-            KafkaLogger._sink_instance.close()
-            KafkaLogger._sink_instance = None
+        if KafkaLogger._sink_instance is None:
+            return
+        # 先移除 loguru sink，停止后台线程往 sink 写入
+        try:
+            logger.remove(KafkaLogger._sink_instance)
+        except Exception:
+            pass
+        KafkaLogger._sink_instance.close()
+        KafkaLogger._sink_instance = None
 
 
 class SYLogger:

{sycommon_python_lib-0.2.1b7 → sycommon_python_lib-0.2.1b8}/src/sycommon_python_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.1b7
+Version: 0.2.1b8
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown