From 6b11c82923e82f5e526cd4f30247d2b470e4c3c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=BF=E7=94=B7?= Date: Sun, 21 Jan 2024 02:15:31 +0800 Subject: [PATCH] fix upyun remove --- scripts/lib/upyun_remove.lua | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/scripts/lib/upyun_remove.lua b/scripts/lib/upyun_remove.lua index be3fe70..caefc99 100644 --- a/scripts/lib/upyun_remove.lua +++ b/scripts/lib/upyun_remove.lua @@ -16,9 +16,11 @@ function upyun_remove.remove(filepath, filename, retry) end if retry > 3 then - ngx.log(ngx.ERR, "failed to remove file : reach max retries") + ngx.status = 200 + local msg = "failed to remove file " .. filepath .. " reach max retries" + ngx.log(ngx.ERR, msg) + ngx.say(msg) else - local upyun, err = Upyun:new2({ user = ngx.var.upyun_operator, passwd = ngx.var.upyun_password, @@ -53,17 +55,18 @@ function upyun_remove.remove(filepath, filename, retry) local info, err = upyun:remove_file(removePath) if not info then local error_table = json.decode(err) - ngx.log(ngx.INFO, "Upyun Remove File Error: " .. err) - ngx.log(ngx.ERR, '[' .. error_table["code"] .. ']') + ngx.log(ngx.ERR, "Upyun Remove File Error: " .. filepath .. " e: " .. err .. " " .. '[' .. error_table["code"] .. ']') + if (error_table["code"] == 40000006) - then - ngx.status = 400 + then ngx.log(ngx.ERR, "Retry remove file : " .. '[' .. err .. ']') upyun_remove.remove(filepath, filename, retry+1) else - ngx.status = 400 - ngx.log(ngx.ERR, "failed to remove file : " .. '[' .. err .. ']') + ngx.status = 200 + local msg = "failed to remove file : " .. filepath .. ' [' .. err .. ']' + ngx.log(ngx.ERR, msg) + ngx.say(msg) end else ngx.status = 200