You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by GitBox <gi...@apache.org> on 2022/12/12 10:48:24 UTC
[GitHub] [apisix] tzssangglass commented on a diff in pull request #8400: feat: add inspect plugin
tzssangglass commented on code in PR #8400:
URL: https://github.com/apache/apisix/pull/8400#discussion_r1045643280
##########
apisix/inspect/init.lua:
##########
@@ -0,0 +1,127 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements. See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+local core = require("apisix.core")
+local dbg = require("apisix.inspect.dbg")
+local lfs = require("lfs")
+local pl_path = require("pl.path")
+local io = io
+local table_insert = table.insert
+local pcall = pcall
+local ipairs = ipairs
+local os = os
+local ngx = ngx
+local loadstring = loadstring
+
+local _M = {}
+
+local last_modified = 0
+
+local stop = false
+
+local running = false
+
+local last_report_time = 0
+
+local REPORT_INTERVAL = 30 -- secs
+
+local function run_lua_file(file)
+ local f, err = io.open(file, "rb")
+ if not f then
+ return false, err
+ end
+ local code = f:read("*all")
+ f:close()
+ if code == nil then
+ return false, "cannot read hooks file"
+ end
+ local func, err = loadstring(code)
+ if not func then
+ return false, err
+ end
+ func()
Review Comment:
do we need use `pcall(func())` here?
##########
apisix/inspect/dbg.lua:
##########
@@ -0,0 +1,151 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements. See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+local core = require("apisix.core")
+local string_format = string.format
+local debug = debug
+local ipairs = ipairs
+local pcall = pcall
+local table_insert = table.insert
+local jit = jit
+
+local _M = {}
+
+local hooks = {}
+
+function _M.getname(n)
+ if n.what == "C" then
+ return n.name
+ end
+ local lc = string_format("%s:%d", n.short_src, n.currentline)
+ if n.what ~= "main" and n.namewhat ~= "" then
+ return string_format("%s (%s)", lc, n.name)
+ else
+ return lc
+ end
+end
+
+local function hook(evt, arg)
Review Comment:
`evt` unused in `hook` function?
##########
apisix/inspect/init.lua:
##########
@@ -0,0 +1,127 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements. See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+local core = require("apisix.core")
+local dbg = require("apisix.inspect.dbg")
+local lfs = require("lfs")
+local pl_path = require("pl.path")
+local io = io
+local table_insert = table.insert
+local pcall = pcall
+local ipairs = ipairs
+local os = os
+local ngx = ngx
+local loadstring = loadstring
+
+local _M = {}
+
+local last_modified = 0
+
+local stop = false
+
+local running = false
+
+local last_report_time = 0
+
+local REPORT_INTERVAL = 30 -- secs
+
+local function run_lua_file(file)
+ local f, err = io.open(file, "rb")
+ if not f then
+ return false, err
+ end
+ local code = f:read("*all")
+ f:close()
+ if code == nil then
+ return false, "cannot read hooks file"
+ end
+ local func, err = loadstring(code)
+ if not func then
+ return false, err
+ end
+ func()
Review Comment:
do we need to use `pcall(func())` here?
##########
apisix/inspect/init.lua:
##########
@@ -0,0 +1,127 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements. See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+local core = require("apisix.core")
+local dbg = require("apisix.inspect.dbg")
+local lfs = require("lfs")
+local pl_path = require("pl.path")
+local io = io
+local table_insert = table.insert
+local pcall = pcall
+local ipairs = ipairs
+local os = os
+local ngx = ngx
+local loadstring = loadstring
+
+local _M = {}
+
+local last_modified = 0
+
+local stop = false
+
+local running = false
+
+local last_report_time = 0
+
+local REPORT_INTERVAL = 30 -- secs
+
+local function run_lua_file(file)
+ local f, err = io.open(file, "rb")
+ if not f then
+ return false, err
+ end
+ local code = f:read("*all")
+ f:close()
+ if code == nil then
+ return false, "cannot read hooks file"
+ end
+ local func, err = loadstring(code)
+ if not func then
+ return false, err
+ end
+ func()
+ return true
+end
+
+local function setup_hooks(file)
+ if pl_path.exists(file) then
+ dbg.unset_all()
+ local _, err = pcall(run_lua_file, file)
+ local hooks = {}
+ for _, hook in ipairs(dbg.hooks()) do
+ table_insert(hooks, hook.key)
+ end
+ core.log.info("set hooks: err=", err, ", hooks=", core.json.encode(hooks))
Review Comment:
```suggestion
core.log.info("set hooks: err: ", err, ", hooks: ", core.json.delay_encode(hooks))
```
is better?
##########
apisix/inspect/init.lua:
##########
@@ -0,0 +1,127 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements. See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+local core = require("apisix.core")
+local dbg = require("apisix.inspect.dbg")
+local lfs = require("lfs")
+local pl_path = require("pl.path")
+local io = io
+local table_insert = table.insert
+local pcall = pcall
+local ipairs = ipairs
+local os = os
+local ngx = ngx
+local loadstring = loadstring
+
+local _M = {}
+
+local last_modified = 0
+
+local stop = false
+
+local running = false
+
+local last_report_time = 0
+
+local REPORT_INTERVAL = 30 -- secs
+
+local function run_lua_file(file)
+ local f, err = io.open(file, "rb")
+ if not f then
+ return false, err
+ end
+ local code = f:read("*all")
+ f:close()
+ if code == nil then
+ return false, "cannot read hooks file"
+ end
+ local func, err = loadstring(code)
+ if not func then
+ return false, err
+ end
+ func()
+ return true
+end
+
+local function setup_hooks(file)
+ if pl_path.exists(file) then
+ dbg.unset_all()
+ local _, err = pcall(run_lua_file, file)
+ local hooks = {}
+ for _, hook in ipairs(dbg.hooks()) do
+ table_insert(hooks, hook.key)
+ end
+ core.log.info("set hooks: err=", err, ", hooks=", core.json.encode(hooks))
Review Comment:
```suggestion
core.log.info("set hooks: err: ", err, ", hooks: ", core.json.delay_encode(hooks))
```
is better?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@apisix.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org