feat(app): 增强优雅停机逻辑与请求处理

- 新增 inFlight 原子计数器以跟踪当前处理的请求数 - 更新 initiateGracefulShutdown 方法，支持每秒检测在途请求，优化停机时长 - 修改日志信息，提供更清晰的停机状态反馈 - 更新 DrainTimeout 注释，明确最长等待时长与检测机制
2026-04-19 09:44:15 +08:00
parent d03ed65d41
commit 0340bc4b8e
4 changed files with 93 additions and 2301 deletions
@@ -40,8 +40,9 @@ type Application struct {
 	*http.Server
 	http.Handler
 	shuttingDown    atomic.Bool   // 停机标志，置为 true 后新请求立即返回 503
+	inFlight        atomic.Int64  // 当前正在处理的请求数（不含已返回 503 的）
 	shutdownOnce    sync.Once     // 保证多路触发（信号/关窗口）只执行一次
-	DrainTimeout    time.Duration // 返回 503 后等 nginx 切流的时长，默认 5s
+	DrainTimeout    time.Duration // 返回 503 后等 nginx 切流的最长时长，默认 5s（每 1s 检测在途请求，为 0 则立即进入 Shutdown）
 	ShutdownTimeout time.Duration // 等在途请求完成的最长时间，默认 30s
 }

@@ -51,17 +52,37 @@ func (that *Application) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 		http.Error(w, "Service Unavailable", http.StatusServiceUnavailable)
 		return
 	}
+	that.inFlight.Add(1)
+	defer that.inFlight.Add(-1)
 	that.handler(w, req)
 }

 // initiateGracefulShutdown 触发优雅停机，通过 sync.Once 保证多路触发只执行一次。
-// drain: 返回 503 后等待上游（nginx）完成流量切换的时长。
+// drain: 返回 503 后等待上游（nginx）完成流量切换的最长时长，每 1s 检测一次在途请求数，
+//        若为 0 则立即进入 Shutdown，避免无谓等待。
 // shutdown: 等待在途请求完成的最长时间。
 func (that *Application) initiateGracefulShutdown(drain, shutdown time.Duration) {
 	that.shutdownOnce.Do(func() {
 		that.shuttingDown.Store(true)
-		that.Log.Infof("优雅停机：新请求已返回 503，等 %v 让 nginx 完成流量切换...", drain)
-		time.Sleep(drain)
+		that.Log.Infof("优雅停机：新请求已返回 503，最多等 %v 让 nginx 完成流量切换（每秒检测在途请求）...", drain)
+
+		// 每秒检测一次，若无在途请求立即停机，否则最多等满 drain
+		tick := time.NewTicker(1 * time.Second)
+		defer tick.Stop()
+		deadline := time.Now().Add(drain)
+		for {
+			if n := that.inFlight.Load(); n == 0 {
+				that.Log.Infof("无在途请求，立即进入 Shutdown")
+				break
+			} else if time.Now().After(deadline) {
+				that.Log.Infof("drain 等待到达上限 %v，仍有 %d 个在途请求，强制进入 Shutdown", drain, n)
+				break
+			} else {
+				that.Log.Infof("drain 等待中，当前在途请求数=%d", n)
+			}
+			<-tick.C
+		}
+
 		ctx, cancel := context.WithTimeout(context.Background(), shutdown)
 		defer cancel()
 		that.Log.Infof("停止接受新连接，等进行中请求完成（最多 %v）...", shutdown)
@@ -0,0 +1 @@
+{"sessionId":"e1b6ef","hypothesisId":"D","message":"partial_run_check","data":{"proj":"app","totalPaths":30,"visitedPaths":0,"isPartialRun":false}}
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh-CN"><head><meta charset="utf-8"><title>API 调试控制台</title>
 <style>
-:root{--bg:#1a1a2e;--bg2:#16213e;--bg3:#0f3460;--fg:#e0e0e0;--fg2:#888;--accent:#4fc3f7;--green:#66bb6a;--red:#ef5350;--border:#2a2a4a;--r:4px}
+:root{--bg:#1a1a2e;--bg2:#16213e;--bg3:#0f3460;--fg:#e0e0e0;--fg2:#888;--accent:#4fc3f7;--green:#66bb6a;--red:#ef5350;--border:#2a2a4a;--r:12px}
 *{box-sizing:border-box;margin:0;padding:0}body{display:flex;height:100vh;background:var(--bg);color:var(--fg);font:13px/1.5 -apple-system,sans-serif}
 input,select,textarea,button{font:inherit}pre{margin:0}
 #side{width:260px;min-width:260px;display:flex;flex-direction:column;border-right:1px solid var(--border);overflow:hidden}
@@ -56,8 +56,8 @@ pre.j{background:#0a0a1a;padding:6px 8px;border-radius:var(--r);font-size:12px;l
 .resp-wrap{display:flex;gap:0}.resp-main{flex:1;min-width:0}
 .resp-main .rsp-hd{display:flex;align-items:center;margin-bottom:3px;font-size:10px;color:var(--fg2);letter-spacing:.5px}
 .resp-main .rsp-hd .cp-sm{margin-left:auto}
-.exp-col-btn{flex-shrink:0;width:22px;display:flex;align-items:stretch;justify-content:center;margin:0 2px}
-.exp-col-btn button{writing-mode:vertical-rl;background:var(--accent);border:none;color:#fff;font-size:10px;padding:6px 3px;border-radius:var(--r);cursor:pointer;user-select:none;line-height:1.2;letter-spacing:1px;opacity:.85}
+.exp-col-btn{flex-shrink:0;width:36px;display:flex;align-items:stretch;justify-content:center;margin:0 2px}
+.exp-col-btn button{writing-mode:vertical-rl;background:var(--accent);border:none;color:#fff;font-size:10px;padding:6px 3px;border-radius:var(--r) 0 0 var(--r);cursor:pointer;user-select:none;line-height:1.2;letter-spacing:1px;opacity:.85}
 .exp-col-btn button:hover{opacity:1}
 .exp-panel{flex:1;min-width:0;display:none;padding-left:6px}
 .resp-wrap.exp-on .exp-panel{display:block}
@@ -207,7 +207,8 @@ function cases(e){
    h+='<div class="cs"><div class="csh" onclick="accordion(this)"><span class="ar'+(i===0?' o':'')+'">&#9654;</span><span class="dot '+(c.passed?'ok':'er')+'"></span>'+esc(c.name)+'<span class="ml">'+c.method+'</span></div>';
    h+='<div class="csb'+(i===0?' o':'')+'"><div style="padding:8px 10px">';
    if(c.note)h+='<div style="color:#aaa;font-size:12px;margin-bottom:8px;line-height:1.5">备注: '+esc(c.note)+'</div>';
-    if(c.verifyError)h+='<div class="verify-err"><span class="verify-label">Verify 校验失败</span>'+esc(c.verifyError)+'</div>';
+    if(!c.passed&&c.failReason)h+='<div class="verify-err"><span class="verify-label">失败原因</span>'+esc(c.failReason)+'</div>';
+    else if(c.verifyError)h+='<div class="verify-err"><span class="verify-label">Verify 校验失败</span>'+esc(c.verifyError)+'</div>';
    const curlId='cc'+i;const respId='cr'+i;
    h+='<div class="row-hd" style="margin-bottom:4px"><span class="sec-title">cURL</span><button class="cp-sm" onclick="event.stopPropagation();copyEl(\''+curlId+'\')">复制</button></div>';
    h+='<div class="curl" id="'+curlId+'">'+esc(caseCurl(e,c))+'</div>';
@@ -215,7 +216,7 @@ function cases(e){
    h+='<div class="row-hd" style="margin:8px 0 4px"><span class="sec-title">响应</span><span class="'+(c.passed?'tg tg-ok':'tg tg-err')+'" style="margin-left:6px">'+(c.passed?'通过':'失败')+'</span></div>';
    if(hasDetail){const vis=getExpVis();h+='<div class="resp-wrap'+(vis?' exp-on':'')+'">';
      h+='<div class="resp-main"><div class="rsp-hd"><span>实际响应</span><button class="cp-sm" onclick="event.stopPropagation();copyEl(\''+respId+'\')">复制</button></div>';if(c.response)h+='<pre class="j resp-j" id="'+respId+'">'+fj(c.response)+'</pre>';else h+='<span style="color:#555" id="'+respId+'">无响应</span>';h+='</div>';
-      h+='<div class="exp-col-btn"><button class="exp-btn" onclick="event.stopPropagation();toggleExpect()">'+(vis?'收起 预期响应':'展开 预期响应')+'</button></div>';
+      h+='<div class="exp-col-btn"><button class="exp-btn" style=" width: 100%; box-sizing: border-box; " onclick="event.stopPropagation();toggleExpect()">'+(vis?'▶ 收起 预期响应':'◀ 展开 预期响应')+'</button></div>';
      h+='<div class="exp-panel"><div class="ep-hd"><span>预期响应</span><button class="cp-sm" onclick="event.stopPropagation();copyEl(\''+expId+'\')">复制</button></div><pre class="j resp-j" id="'+expId+'">'+fj(c.expect)+'</pre></div>';
    h+='</div>';}
    else{if(c.response)h+='<pre class="j" id="'+respId+'">'+fj(c.response)+'</pre>';else h+='<span style="color:#555" id="'+respId+'">无响应</span>';}
@@ -260,7 +261,7 @@ function buildLeft(e){
  if(tk&&at==='query')qDef='<div class="kv" data-auth="1"><input value="token"><input value="'+esc(tk)+'"><button onclick="this.parentElement.remove()">&#215;</button></div>';
  qDef+='<div class="kv"><input placeholder="key"><input placeholder="value"><button onclick="this.parentElement.remove()">&#215;</button></div>';
  l+='<div class="sec"><div class="row-hd"><span class="sec-title">Query 参数</span><button class="addbtn" onclick="addKV(\'q-rows\')">+ 添加</button></div><div id="q-rows">'+qDef+'</div></div>';
-  l+='<div class="sec"><div class="row-hd"><span class="sec-title">文件上传</span><button class="addbtn" onclick="addFileRow()">+ 添加</button></div><div id="file-rows"><div class="kv"><input placeholder="字段名" value="file" style="max-width:120px"><input type="file"><button onclick="this.parentElement.remove()">&#215;</button></div></div></div>';
+  l+='<div class="sec"><div class="row-hd"><span class="sec-title">文件上传</span><button class="addbtn" onclick="addFileRow()">+ 添加</button></div><div id="file-rows"><div class="kv"><input placeholder="字段名" value="" style="max-width:120px"><input type="file"><button onclick="this.parentElement.remove()">&#215;</button></div></div></div>';
  let jsonPH='';
  if(e.params){
    const jp=e.params.filter(p=>p.in==='json');
@@ -305,7 +306,7 @@ function addKVReq(id,k,v,req){
 }
 function addFileRow(field){
  const row=document.createElement('div');row.className='kv';
-  row.innerHTML='<input placeholder="字段名" value="'+esc(field||'file')+'" style="max-width:120px"><input type="file"><button onclick="this.parentElement.remove()">&#215;</button>';
+  row.innerHTML='<input placeholder="字段名" value="'+esc(field||'')+'" style="max-width:120px"><input type="file"><button onclick="this.parentElement.remove()">&#215;</button>';
  document.getElementById('file-rows').appendChild(row);
 }
 function setAcc(t){
@@ -373,14 +374,15 @@ function updateCasePanel(e,i){
  const c=e.cases[i];
  let h='<div style="padding:8px 10px">';
  if(c.note)h+='<div style="color:#aaa;font-size:12px;margin-bottom:8px;line-height:1.5">备注: '+esc(c.note)+'</div>';
-  if(c.verifyError)h+='<div class="verify-err"><span class="verify-label">Verify 校验失败</span>'+esc(c.verifyError)+'</div>';
+  if(!c.passed&&c.failReason)h+='<div class="verify-err"><span class="verify-label">失败原因</span>'+esc(c.failReason)+'</div>';
+  else if(c.verifyError)h+='<div class="verify-err"><span class="verify-label">Verify 校验失败</span>'+esc(c.verifyError)+'</div>';
  h+='<div class="row-hd" style="margin-bottom:4px"><span class="sec-title">cURL</span><span class="'+(c.passed?'tg tg-ok':'tg tg-err')+'" style="margin-left:6px">'+(c.passed?'通过':'失败')+'</span><button class="cp-sm" onclick="copyEl(\'c-curl\')" style="margin-left:auto">复制</button></div>';
  h+='<div class="curl" id="c-curl">'+esc(caseCurl(e,c))+'</div>';
  const hasDetail=c.expect&&c.expect.result!==undefined;
  h+='<div class="row-hd" style="margin:8px 0 4px"><span class="sec-title">响应</span></div>';
  if(hasDetail){const vis=getExpVis();h+='<div class="resp-wrap'+(vis?' exp-on':'')+'">';
    h+='<div class="resp-main"><div class="rsp-hd"><span>实际响应</span><button class="cp-sm" onclick="copyEl(\'c-resp\')">复制</button></div>';if(c.response)h+='<pre class="j resp-j" id="c-resp">'+fj(c.response)+'</pre>';else h+='<span style="color:#555" id="c-resp">无响应</span>';h+='</div>';
-    h+='<div class="exp-col-btn"><button class="exp-btn" onclick="toggleExpect()">'+(vis?'收起 预期响应':'展开 预期响应')+'</button></div>';
+    h+='<div class="exp-col-btn"><button class="exp-btn" style=" width: 100%; box-sizing: border-box; " onclick="toggleExpect()">'+(vis?'▶ 收起 预期响应':'◀ 展开 预期响应')+'</button></div>';
    h+='<div class="exp-panel"><div class="ep-hd"><span>预期响应</span><button class="cp-sm" onclick="copyEl(\'c-exp\')">复制</button></div><pre class="j resp-j" id="c-exp">'+fj(c.expect)+'</pre></div>';
  h+='</div>';}
  else{if(c.response)h+='<pre class="j" id="c-resp">'+fj(c.response)+'</pre>';else h+='<span style="color:#555" id="c-resp">无响应</span>';}
@@ -510,7 +512,7 @@ async function send(){
 function copyEl(id){navigator.clipboard.writeText(document.getElementById(id).textContent).then(()=>{const b=event.target;b.textContent='已复制';setTimeout(()=>{b.textContent='复制'},1200);});}
 function cpNext(btn){let el=btn.closest('h5').nextElementSibling;let t='';while(el&&el.tagName!=='H5'){if(el.tagName==='PRE')t+=(t?'\n':'')+el.textContent;el=el.nextElementSibling;}navigator.clipboard.writeText(t).then(()=>{btn.textContent='已复制';setTimeout(()=>{btn.textContent='复制'},1200);});}
 function getExpVis(){const v=localStorage.getItem('expect_vis');return v===null||v==='1';}
-function toggleExpect(){const vis=getExpVis();const nv=!vis;localStorage.setItem('expect_vis',nv?'1':'0');document.querySelectorAll('.resp-wrap').forEach(w=>{w.classList.toggle('exp-on',nv);});document.querySelectorAll('.exp-btn').forEach(b=>{b.textContent=nv?'收起 预期响应':'展开 预期响应';});}
+function toggleExpect(){const vis=getExpVis();const nv=!vis;localStorage.setItem('expect_vis',nv?'1':'0');document.querySelectorAll('.resp-wrap').forEach(w=>{w.classList.toggle('exp-on',nv);});document.querySelectorAll('.exp-btn').forEach(b=>{b.textContent=nv?'▶ 收起 预期响应':'◀ 展开 预期响应';});}
 function togJP(){const bd=document.querySelector('.jp-bd');const ar=document.querySelector('.jp-ar');const tg=document.querySelector('.jp-toggle');if(!bd)return;const vis=bd.style.display!=='none';bd.style.display=vis?'none':'flex';if(ar)ar.classList.toggle('o',!vis);if(tg)tg.textContent=vis?'展开':'收起';localStorage.setItem('json_params_vis',vis?'0':'1');}
 function fj(o){return esc(JSON.stringify(o,null,2));}
 function fjp(o,params){
				`@@ -0,0 +1 @@`
				`{"sessionId":"e1b6ef","hypothesisId":"D","message":"partial_run_check","data":{"proj":"app","totalPaths":30,"visitedPaths":0,"isPartialRun":false}}`