浏览代码

conf: fix unexpected behavior of config inheritance (#5007)

Unknwon 6 年之前
父节点
当前提交
a91d9054ad
共有 2 个文件被更改,包括 11 次插入9 次删除
  1. 8 8
      conf/app.ini
  2. 3 1
      pkg/bindata/bindata.go

+ 8 - 8
conf/app.ini

@@ -330,13 +330,13 @@ LEVEL = Trace
 
 ; For "console" mode only
 [log.console]
-; leave empty to inherit
-LEVEL =
+; Comment out to inherit
+; LEVEL =
 
 ; For "file" mode only
 [log.file]
-; leave empty to inherit
-LEVEL =
+; Comment out to inherit
+; LEVEL =
 ; This enables automated log rotate (switch of following options)
 LOG_ROTATE = true
 ; Segment log daily
@@ -350,14 +350,14 @@ MAX_DAYS = 7
 
 ; For "slack" mode only
 [log.slack]
-; leave empty to inherit
-LEVEL =
+; Comment out to inherit
+; LEVEL =
 ; Webhook URL
 URL =
 
 [log.discord]
-; leave empty to inherit
-LEVEL =
+; Comment out to inherit
+; LEVEL =
 ; Webhook URL
 URL =
 ; Username displayed in webhook

文件差异内容过多而无法显示
+ 3 - 1
pkg/bindata/bindata.go


部分文件因为文件数量过多而无法显示