jettask 0.2.17__py3-none-any.whl → 0.2.19__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- jettask/__init__.py +51 -0
- jettask/config/nacos_config.py +34 -14
- {jettask-0.2.17.dist-info → jettask-0.2.19.dist-info}/METADATA +1 -1
- {jettask-0.2.17.dist-info → jettask-0.2.19.dist-info}/RECORD +8 -8
- {jettask-0.2.17.dist-info → jettask-0.2.19.dist-info}/WHEEL +0 -0
- {jettask-0.2.17.dist-info → jettask-0.2.19.dist-info}/entry_points.txt +0 -0
- {jettask-0.2.17.dist-info → jettask-0.2.19.dist-info}/licenses/LICENSE +0 -0
- {jettask-0.2.17.dist-info → jettask-0.2.19.dist-info}/top_level.txt +0 -0
jettask/__init__.py
CHANGED
@@ -3,17 +3,68 @@
|
|
3
3
|
JetTask - High Performance Distributed Task Queue System
|
4
4
|
"""
|
5
5
|
|
6
|
+
import logging
|
7
|
+
import inspect
|
8
|
+
|
6
9
|
# Core class imports
|
7
10
|
from jettask.core.app import Jettask
|
8
11
|
from jettask.core.message import TaskMessage
|
9
12
|
from jettask.task_center import TaskCenter
|
10
13
|
|
14
|
+
# Import logger components from utils
|
15
|
+
from jettask.utils.task_logger import (
|
16
|
+
TaskContextFilter,
|
17
|
+
ExtendedTextFormatter,
|
18
|
+
LogContext
|
19
|
+
)
|
20
|
+
|
11
21
|
# Version info
|
12
22
|
__version__ = "0.1.0"
|
13
23
|
|
24
|
+
|
25
|
+
def get_task_logger(name: str = None) -> logging.Logger:
|
26
|
+
"""
|
27
|
+
获取带任务上下文的logger
|
28
|
+
|
29
|
+
Args:
|
30
|
+
name: logger名称,默认使用调用者的模块名
|
31
|
+
|
32
|
+
Returns:
|
33
|
+
配置好的logger实例
|
34
|
+
|
35
|
+
Example:
|
36
|
+
from jettask import get_task_logger
|
37
|
+
logger = get_task_logger()
|
38
|
+
logger.info("处理任务")
|
39
|
+
"""
|
40
|
+
if name is None:
|
41
|
+
# 自动获取调用者的模块名
|
42
|
+
frame = inspect.currentframe()
|
43
|
+
if frame and frame.f_back:
|
44
|
+
name = frame.f_back.f_globals.get('__name__', 'jettask')
|
45
|
+
else:
|
46
|
+
name = 'jettask'
|
47
|
+
|
48
|
+
logger = logging.getLogger(name)
|
49
|
+
|
50
|
+
# 如果logger还没有处理器,添加默认处理器
|
51
|
+
if not logger.handlers:
|
52
|
+
handler = logging.StreamHandler()
|
53
|
+
handler.setFormatter(ExtendedTextFormatter(
|
54
|
+
'%(asctime)s - %(levelname)s - [%(task_id)s] - %(name)s - %(message)s'
|
55
|
+
))
|
56
|
+
handler.addFilter(TaskContextFilter())
|
57
|
+
logger.addHandler(handler)
|
58
|
+
logger.propagate = False
|
59
|
+
|
60
|
+
return logger
|
61
|
+
|
62
|
+
|
14
63
|
# Public API exports
|
15
64
|
__all__ = [
|
16
65
|
"Jettask",
|
17
66
|
"TaskMessage",
|
18
67
|
"TaskCenter",
|
68
|
+
"get_task_logger",
|
69
|
+
"LogContext",
|
19
70
|
]
|
jettask/config/nacos_config.py
CHANGED
@@ -53,23 +53,38 @@ class Config:
|
|
53
53
|
# 配置锁,保证线程安全
|
54
54
|
self._config_lock = threading.RLock()
|
55
55
|
|
56
|
+
# 标记是否已初始化
|
57
|
+
self._initialized = False
|
58
|
+
self._config = None
|
59
|
+
|
60
|
+
@property
|
61
|
+
def config(self) -> dict:
|
62
|
+
"""获取当前配置(线程安全,延迟初始化)"""
|
63
|
+
with self._config_lock:
|
64
|
+
# 延迟初始化:第一次访问时才初始化并加载配置
|
65
|
+
if not self._initialized:
|
66
|
+
self._lazy_init()
|
67
|
+
return self._config
|
68
|
+
|
69
|
+
def _lazy_init(self):
|
70
|
+
"""延迟初始化:第一次访问配置时才执行"""
|
71
|
+
if self._initialized:
|
72
|
+
return
|
73
|
+
|
74
|
+
logger.info("第一次访问配置,开始初始化...")
|
75
|
+
|
56
76
|
# 初始化配置
|
57
77
|
self._init_config()
|
58
78
|
|
79
|
+
# 加载配置
|
59
80
|
self._config = self._load_config()
|
60
81
|
|
61
|
-
|
62
82
|
# 启动定时刷新
|
63
|
-
if not self.local_dev_mode and refresh_interval > 0:
|
83
|
+
if not self.local_dev_mode and self.refresh_interval > 0:
|
64
84
|
self.start_refresh_thread()
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
"""获取当前配置(线程安全)"""
|
69
|
-
with self._config_lock:
|
70
|
-
if not hasattr(self, '_config'):
|
71
|
-
self._config = self._load_config()
|
72
|
-
return self._config
|
85
|
+
|
86
|
+
self._initialized = True
|
87
|
+
logger.info("配置初始化完成")
|
73
88
|
|
74
89
|
def _init_config(self):
|
75
90
|
"""初始化配置"""
|
@@ -265,8 +280,7 @@ class Config:
|
|
265
280
|
|
266
281
|
def get(self, key, default=None):
|
267
282
|
"""获取配置项(线程安全)"""
|
268
|
-
|
269
|
-
return self.config.get(key, default)
|
283
|
+
return self.config.get(key, default)
|
270
284
|
|
271
285
|
def refresh(self) -> bool:
|
272
286
|
"""手动刷新配置
|
@@ -274,9 +288,14 @@ class Config:
|
|
274
288
|
Returns:
|
275
289
|
True if config was refreshed, False otherwise
|
276
290
|
"""
|
291
|
+
# 如果还未初始化,不执行刷新
|
292
|
+
if not self._initialized:
|
293
|
+
logger.debug("配置尚未初始化,跳过刷新")
|
294
|
+
return False
|
295
|
+
|
277
296
|
try:
|
278
297
|
logger.info("手动触发配置刷新")
|
279
|
-
old_config = self._config.copy() if
|
298
|
+
old_config = self._config.copy() if self._config else {}
|
280
299
|
|
281
300
|
with self._config_lock:
|
282
301
|
new_config = self._load_config()
|
@@ -365,6 +384,7 @@ class Config:
|
|
365
384
|
def get_config_info(self) -> Dict[str, Any]:
|
366
385
|
"""获取配置信息"""
|
367
386
|
return {
|
387
|
+
'initialized': self._initialized,
|
368
388
|
'version': self.config_version,
|
369
389
|
'last_refresh_time': self.last_refresh_time.isoformat() if self.last_refresh_time else None,
|
370
390
|
'refresh_interval': self.refresh_interval,
|
@@ -374,7 +394,7 @@ class Config:
|
|
374
394
|
'nacos_group': self.nacos_group,
|
375
395
|
'nacos_data_id': self.nacos_data_id,
|
376
396
|
'local_dev_mode': self.local_dev_mode,
|
377
|
-
'config_items_count': len(self.
|
397
|
+
'config_items_count': len(self._config) if self._config else 0
|
378
398
|
}
|
379
399
|
|
380
400
|
def __del__(self):
|
@@ -1,4 +1,4 @@
|
|
1
|
-
jettask/__init__.py,sha256=
|
1
|
+
jettask/__init__.py,sha256=RfizYMyGAHCUtzI8plwR_hesGVXWMHh9SsAU4DvJhsw,1674
|
2
2
|
jettask/__main__.py,sha256=NfkMpD7z2Jc6YrgbZaBlgCGO621zIi632Ee-P87UcfU,5556
|
3
3
|
jettask/api.py,sha256=agK2l6zBq4KRcthX5GexDBMo9rYgCtSGPgWemucuexk,95867
|
4
4
|
jettask/cleanup_deprecated_tables.sql,sha256=RmgwI1zx1qWiy4OXtTYPvBRFICkeqzC-1_xWOsnrrlI,529
|
@@ -59,7 +59,7 @@ jettask/backend/models/requests.py,sha256=fsHiv4sU46biQ1bK1KfV-yxak0LRoFLoe-dPvH
|
|
59
59
|
jettask/backend/models/responses.py,sha256=FwGpAFNL61a2okJFD41TYLcuwu-41FHXrk6P190jxzw,8528
|
60
60
|
jettask/backend/services/__init__.py,sha256=DCf9NuJo1a65q3CXG0GtRksQpDhg3QuvmTYiWjxGjVE,57
|
61
61
|
jettask/config/__init__.py,sha256=qCRGmiXSK45LDU9pr0bUC-VoZAkTK1jAch1i9tvHCeE,158
|
62
|
-
jettask/config/nacos_config.py,sha256=
|
62
|
+
jettask/config/nacos_config.py,sha256=dgOCwflZVVoA71qj113XPTyQMCetLSS6lD6au-2skfU,14847
|
63
63
|
jettask/config/performance.py,sha256=bOdLEskfB_6cRfS10IRgmtKEsJw_CaIZsPHbXxaHwbU,5686
|
64
64
|
jettask/core/__init__.py,sha256=CvBoBCERXCo-jgnkPqAuIgT4uC7oQMnSi7okRxMi6Vc,181
|
65
65
|
jettask/core/app.py,sha256=qQPYl74uKV1ZgnuNTvPNPD0F_JVH20oZrsz9jIJusjk,70737
|
@@ -142,9 +142,9 @@ jettask/webui_models/__init__.py,sha256=5cv0oZksj1B3_rzCqsPmF3Gn9NRZLwzMnaJ8bOKG
|
|
142
142
|
jettask/webui_models/namespace.py,sha256=jDj-hZF_-wXzrWAWVDyZVU0JUWDax9apb4Gyykwg-rE,2006
|
143
143
|
jettask/webui_sql/batch_upsert_functions.sql,sha256=5eWOhOD8gWHhtcop_BrCpZTxPFeyBHtt_leNQZO89Cs,6615
|
144
144
|
jettask/webui_sql/verify_database.sql,sha256=HtTup3xHWbOo1BTU_u4i41E9LrPEXB8qYbChL9WeWOc,2313
|
145
|
-
jettask-0.2.
|
146
|
-
jettask-0.2.
|
147
|
-
jettask-0.2.
|
148
|
-
jettask-0.2.
|
149
|
-
jettask-0.2.
|
150
|
-
jettask-0.2.
|
145
|
+
jettask-0.2.19.dist-info/licenses/LICENSE,sha256=sKR8OPWvnqxzcHAmnaVSANpRpeM0Z52PNLCB0ZlFN6c,1062
|
146
|
+
jettask-0.2.19.dist-info/METADATA,sha256=YWrMkpm12jcU-Tc31SQPRITfnR5Rgih4BReJuX4AcFI,3015
|
147
|
+
jettask-0.2.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
148
|
+
jettask-0.2.19.dist-info/entry_points.txt,sha256=9-8eTLJPgzpBgeGC8WHdMYtldZxHAXFspMeqArVUdew,148
|
149
|
+
jettask-0.2.19.dist-info/top_level.txt,sha256=uymyRUF87-OsSurk5NhpeTW0jy3Wltnn91Zoa6jmAaw,8
|
150
|
+
jettask-0.2.19.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|