ソースを参照

:sparkles: http 超时默认 20s, 日志添加 luat 状态码描述

Mizore 1 年間 前
コミット
344c619109
1 ファイル変更18 行追加5 行削除
  1. 18 5
      script/util_http.lua

+ 18 - 5
script/util_http.lua

@@ -5,6 +5,19 @@ local http_count = 0
 -- 记录正在运行的 http 请求数量
 local http_running_count = 0
 
+local luat_http_code_desc = {
+    [0] = "HTTP_OK",
+    [-1] = "HTTP_ERROR_STATE",
+    [-2] = "HTTP_ERROR_HEADER",
+    [-3] = "HTTP_ERROR_BODY",
+    [-4] = "HTTP_ERROR_CONNECT",
+    [-5] = "HTTP_ERROR_CLOSE",
+    [-6] = "HTTP_ERROR_RX",
+    [-7] = "HTTP_ERROR_DOWNLOAD",
+    [-8] = "HTTP_ERROR_TIMEOUT",
+    [-9] = "HTTP_ERROR_FOTA",
+}
+
 --- 对 http.request 的封装
 -- @param timeout 超时时间(单位: 毫秒)
 -- @param method 请求方法
@@ -14,7 +27,7 @@ local http_running_count = 0
 function util_http.fetch(timeout, method, url, headers, body)
     collectgarbage("collect")
 
-    timeout = timeout or 1000 * 25
+    timeout = timeout or 1000 * 20
     local opts = { timeout = timeout }
 
     http_count = http_count + 1
@@ -27,12 +40,12 @@ function util_http.fetch(timeout, method, url, headers, body)
 
     log.debug("util_http.fetch", "开始请求", "id:", id)
     res_code, res_headers, res_body = http.request(method, url, headers, body, opts).wait()
-    log.debug("util_http.fetch", "请求结束", "id:", id, "code:", res_code)
-
-    if res_code == -8 then log.warn("util_http.fetch", "请求超时", "id:", id) end
+    log.debug("util_http.fetch", "请求结束", "id:", id, "code:", res_code, "desc:", luat_http_code_desc[res_code])
 
     http_running_count = http_running_count - 1
-    if http_running_count == 0 then util_netled.blink() end
+    if http_running_count == 0 then
+        util_netled.blink()
+    end
 
     collectgarbage("collect")