日志模块拆分 category 参数:log.xxx(category, ...args) 输出 timestamp [level] [category]
- log.js 签名改为 log.xxx(category, ...args);头三段为时间戳 [level] [category],后续参数(含 Error/对象)透传 console 走 util.format
- 所有调用点迁移:从 log.info('[msg] xxx') → log.info('msg', 'xxx');server 启动行无前缀,统一归入 startup
- 实测输出:2026-09-05 09:27:12.068 [debug] [sse] task-20260904-012 event: ping
This commit is contained in:
@@ -162,7 +162,7 @@ router.put('/', wrap((req, res) => {
|
||||
let next;
|
||||
try { next = loadConfigFromText(restored, cfg.config_path); } catch (e) { return badRequest(res, e); }
|
||||
writeConfigText(cfg, restored);
|
||||
log.info('[config] ' + (req.user || '-') + ' 整文件保存配置,变更段:' + (diffTop(cfg, next).join(',') || '无'));
|
||||
log.info('config', (req.user || '-') + ' 整文件保存配置,变更段:' + (diffTop(cfg, next).join(',') || '无'));
|
||||
res.json({ ok: true, changed: diffTop(cfg, next), restart_required: true });
|
||||
}));
|
||||
|
||||
@@ -186,7 +186,7 @@ router.patch('/', wrap((req, res) => {
|
||||
let next;
|
||||
try { next = loadConfigFromText(nextText, cfg.config_path); } catch (e) { return badRequest(res, e); }
|
||||
writeConfigText(cfg, nextText);
|
||||
log.info('[config] ' + (req.user || '-') + ' 修改配置项 ' + pathArr.join('.') + (body.op === 'delete' ? '(删除)' : '') + ',变更段:' + (diffTop(cfg, next).join(',') || '无'));
|
||||
log.info('config', (req.user || '-') + ' 修改配置项 ' + pathArr.join('.') + (body.op === 'delete' ? '(删除)' : '') + ',变更段:' + (diffTop(cfg, next).join(',') || '无'));
|
||||
res.json({ ok: true, changed: diffTop(cfg, next), restart_required: true });
|
||||
}));
|
||||
|
||||
|
||||
@@ -66,8 +66,8 @@ router.post('/:id/files', upload.array('files', 10), function (req, res) {
|
||||
}
|
||||
// 不再自动通知 AI:附件随用户下一条消息统一告知(见 routes/messages.js 的 attachments)
|
||||
if (uploaded.length) {
|
||||
log.info('[file] ' + (req.user || '-') + ' ' + req.params.id + ' 上传 ' + uploaded.length + ' 个文件:' +
|
||||
uploaded.map(f => f.filename + '(' + f.size + 'B)').join('、'));
|
||||
log.info('file', (req.user || '-') + ' ' + req.params.id + ' 上传 ' + uploaded.length + ' 个文件:' +
|
||||
uploaded.map(f => f.filename + '(' + f.size + 'B)').join('、'));
|
||||
}
|
||||
res.json({ uploaded });
|
||||
} catch (err) {
|
||||
@@ -191,7 +191,7 @@ router.delete('/:id/files', function (req, res) {
|
||||
fs.rmSync(abs, { recursive: true, force: true });
|
||||
engine.getDb().prepare('DELETE FROM files WHERE session_id = ? AND filename = ?')
|
||||
.run(req.params.id, rel);
|
||||
log.info('[file] ' + (req.user || '-') + ' ' + req.params.id + ' 删除文件 ' + rel);
|
||||
log.info('file', (req.user || '-') + ' ' + req.params.id + ' 删除文件 ' + rel);
|
||||
res.json({ ok: true });
|
||||
} catch (err) {
|
||||
res.status(404).json({ error: '文件不存在' });
|
||||
|
||||
@@ -44,8 +44,8 @@ router.post('/:id/messages', wrap((req, res) => {
|
||||
// deepThink:是否启用模型该「深度思考」参数(thinking_params 合并进上游请求体)
|
||||
const deepThink = !!(req.body && req.body.deepThink);
|
||||
const r = engine.postUserMessage(req.params.id, content, { deepThink });
|
||||
log.info('[msg] ' + (req.user || '-') + ' ' + req.params.id + ' 用户消息(' + (r && r.delivered || '?') + '):' +
|
||||
content.slice(0, 60).replace(/\s+/g, ' '));
|
||||
log.info('msg', (req.user || '-') + ' ' + req.params.id + ' 用户消息(' + (r && r.delivered || '?') + '):' +
|
||||
content.slice(0, 60).replace(/\s+/g, ' '));
|
||||
res.json(r);
|
||||
}));
|
||||
|
||||
@@ -66,7 +66,7 @@ router.post('/:id/release', wrap((req, res) => {
|
||||
// 状态收尾为已完成并释放模型/出队;正在执行的回合会被拒绝(需先「终止」)。
|
||||
router.delete('/:id/messages', wrap((req, res) => {
|
||||
const r = engine.clearSessionMessages(req.params.id);
|
||||
log.info('[msg] ' + (req.user || '-') + ' ' + req.params.id + ' 清空会话内容(文件保留)');
|
||||
log.info('msg', (req.user || '-') + ' ' + req.params.id + ' 清空会话内容(文件保留)');
|
||||
res.json(r);
|
||||
}));
|
||||
|
||||
@@ -75,8 +75,8 @@ router.delete('/:id/messages', wrap((req, res) => {
|
||||
// 库中没了,后续发给模型的消息里自然也没有;执行中删除会在下一轮组装历史时生效。
|
||||
router.delete('/:id/messages/:messageId', wrap((req, res) => {
|
||||
const r = engine.deleteMessage(req.params.id, Number(req.params.messageId));
|
||||
log.info('[msg] ' + (req.user || '-') + ' ' + req.params.id + ' 删除消息 ' + req.params.messageId +
|
||||
(r.removed > 1 ? '(连带 ' + (r.removed - 1) + ' 条工具回执)' : ''));
|
||||
log.info('msg', (req.user || '-') + ' ' + req.params.id + ' 删除消息 ' + req.params.messageId +
|
||||
(r.removed > 1 ? '(连带 ' + (r.removed - 1) + ' 条工具回执)' : ''));
|
||||
res.json(r);
|
||||
}));
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@ router.post('/', wrap((req, res) => {
|
||||
// 创建者取认证中间件的 req.user(不信客户端传参);未启用认证时为空串
|
||||
const user = String(req.user || '').trim().slice(0, 64);
|
||||
const session = engine.createSession(title, modelId, assistantType, user);
|
||||
log.info('[task] ' + (req.user || '-') + ' 新建任务 ' + session.id + '「' + (session.title || '未命名') + '」model=' + (modelId || '自动') + ' type=' + (session.assistant_type || 'secretary'));
|
||||
log.info('task', (req.user || '-') + ' 新建任务 ' + session.id + '「' + (session.title || '未命名') + '」model=' + (modelId || '自动') + ' type=' + (session.assistant_type || 'secretary'));
|
||||
res.json(session);
|
||||
}));
|
||||
|
||||
@@ -147,7 +147,7 @@ router.patch('/:id', wrap((req, res) => {
|
||||
|
||||
router.delete('/:id', wrap((req, res) => {
|
||||
const delDir = req.query.delete_dir === 'true' || req.query.delete_dir === '';
|
||||
log.info('[task] ' + (req.user || '-') + ' 删除任务 ' + req.params.id + (delDir ? '(含任务目录)' : ''));
|
||||
log.info('task', (req.user || '-') + ' 删除任务 ' + req.params.id + (delDir ? '(含任务目录)' : ''));
|
||||
res.json(engine.deleteSession(req.params.id, delDir));
|
||||
}));
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@ router.post('/restart', wrap((req, res) => {
|
||||
try { loadConfig(cfg.config_path); } catch (e) {
|
||||
return res.status(409).json({ error: '配置文件当前内容不合法,重启将无法启动:' + String(e && e.message || e) });
|
||||
}
|
||||
log.info('[system] 收到重启请求(force=' + force + ',打断 ' + running.length + ' 个回合),进程退出,等待 Docker 拉起');
|
||||
log.info('system', '收到重启请求(force=' + force + ',打断 ' + running.length + ' 个回合),进程退出,等待 Docker 拉起');
|
||||
res.json({ ok: true, restarting: true });
|
||||
// 稍候再退出,确保响应已发出;容器由 Docker restart 策略自动重启
|
||||
setTimeout(() => process.exit(0), 300);
|
||||
|
||||
Reference in New Issue
Block a user