DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

used cjson.safe instead of pcall.

Browse source
This commit is contained in:
WenMing 2019-01-18 11:46:14 +08:00
parent d968ee9cfd
commit 1d37e83a18
4 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rootfs/etc/nginx/lua/monitor.lua
View file

@ -1,5 +1,5 @@
local socket = ngx.socket.tcp
local cjson = require('cjson')
local cjson = require("cjson.safe")
local assert = assert
local metrics_batch = {}
@ -49,9 +49,9 @@ local function flush(premature)
local current_metrics_batch = metrics_batch
metrics_batch = {}
local ok, payload = pcall(cjson.encode, current_metrics_batch)
if not ok then
ngx.log(ngx.ERR, "error while encoding metrics: " .. tostring(payload))
local payload, err = cjson.encode(current_metrics_batch)
if not payload then
ngx.log(ngx.ERR, "error while encoding metrics: ", err)
return
end