bugfix: allow write debug log even if the openresty disabled debug mo…

…del (#1124) fix #1121 (comment)
apache · Feb 16, 2020 · c881c04 · c881c04
1 parent 0600525
commit c881c04
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -56,6 +56,7 @@ client_body_temp
 utils/lj-releng
 .idea/
 *.iml
+dashboard/
 
 # .travis
 !.travis/*.sh
diff --git a/lua/apisix/core/log.lua b/lua/apisix/core/log.lua
@@ -16,8 +16,6 @@
 --
 local ngx = ngx
 local ngx_log  = ngx.log
-local ngx_DEBUG= ngx.DEBUG
-local DEBUG    = ngx.config.debug
 local require  = require
 
 
@@ -44,8 +42,7 @@ setmetatable(_M, {__index = function(self, cmd)
     local log_level = log_levels[cmd]
 
     local method
-    if cur_level and (log_level > cur_level or
-        (log_level == ngx_DEBUG and not DEBUG))
+    if cur_level and (log_level > cur_level)
     then
         method = do_nothing
     else

diff --git a/t/core/log.t b/t/core/log.t
@@ -57,6 +57,7 @@ info log
             core.log.warn("warn log")
             core.log.notice("notice log")
             core.log.info("info log")
+            core.log.debug("debug log")
             ngx.say("done")
         }
     }
@@ -69,6 +70,7 @@ warn log
 --- no_error_log
 notice log
 info log
+debug log
 
 
 
@@ -81,6 +83,7 @@ info log
             core.log.warn("warn log")
             core.log.notice("notice log")
             core.log.info("info log")
+            core.log.debug("debug log")
             ngx.say("done")
         }
     }
@@ -93,6 +96,7 @@ warn log
 notice log
 --- no_error_log
 info log
+debug log