mirror of
https://github.com/casdoor/casdoor.git
synced 2025-05-22 18:25:47 +08:00
feat: support adapter in app.conf logConfig (#3784)
This commit is contained in:
parent
f8f864c5b9
commit
b15b3b9335
@ -31,7 +31,7 @@ radiusServerPort = 1812
|
|||||||
radiusDefaultOrganization = "built-in"
|
radiusDefaultOrganization = "built-in"
|
||||||
radiusSecret = "secret"
|
radiusSecret = "secret"
|
||||||
quota = {"organization": -1, "user": -1, "application": -1, "provider": -1}
|
quota = {"organization": -1, "user": -1, "application": -1, "provider": -1}
|
||||||
logConfig = {"filename": "logs/casdoor.log", "maxdays":99999, "perm":"0770"}
|
logConfig = {"adapter":"file", "filename": "logs/casdoor.log", "maxdays":99999, "perm":"0770"}
|
||||||
initDataNewOnly = false
|
initDataNewOnly = false
|
||||||
initDataFile = "./init_data.json"
|
initDataFile = "./init_data.json"
|
||||||
frontendBaseDir = "../cc_0"
|
frontendBaseDir = "../cc_0"
|
@ -115,7 +115,7 @@ func TestGetConfigLogs(t *testing.T) {
|
|||||||
description string
|
description string
|
||||||
expected string
|
expected string
|
||||||
}{
|
}{
|
||||||
{"Default log config", `{"filename": "logs/casdoor.log", "maxdays":99999, "perm":"0770"}`},
|
{"Default log config", `{"adapter":"file", "filename": "logs/casdoor.log", "maxdays":99999, "perm":"0770"}`},
|
||||||
}
|
}
|
||||||
|
|
||||||
err := beego.LoadAppConfig("ini", "app.conf")
|
err := beego.LoadAppConfig("ini", "app.conf")
|
||||||
|
19
main.go
19
main.go
@ -15,6 +15,7 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/beego/beego"
|
"github.com/beego/beego"
|
||||||
@ -77,10 +78,26 @@ func main() {
|
|||||||
beego.BConfig.WebConfig.Session.SessionGCMaxLifetime = 3600 * 24 * 30
|
beego.BConfig.WebConfig.Session.SessionGCMaxLifetime = 3600 * 24 * 30
|
||||||
// beego.BConfig.WebConfig.Session.SessionCookieSameSite = http.SameSiteNoneMode
|
// beego.BConfig.WebConfig.Session.SessionCookieSameSite = http.SameSiteNoneMode
|
||||||
|
|
||||||
err := logs.SetLogger(logs.AdapterFile, conf.GetConfigString("logConfig"))
|
var logAdapter string
|
||||||
|
logConfigMap := make(map[string]interface{})
|
||||||
|
err := json.Unmarshal([]byte(conf.GetConfigString("logConfig")), &logConfigMap)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
_, ok := logConfigMap["adapter"]
|
||||||
|
if !ok {
|
||||||
|
logAdapter = "file"
|
||||||
|
} else {
|
||||||
|
logAdapter = logConfigMap["adapter"].(string)
|
||||||
|
}
|
||||||
|
if logAdapter == "console" {
|
||||||
|
logs.Reset()
|
||||||
|
}
|
||||||
|
err = logs.SetLogger(logAdapter, conf.GetConfigString("logConfig"))
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
port := beego.AppConfig.DefaultInt("httpport", 8000)
|
port := beego.AppConfig.DefaultInt("httpport", 8000)
|
||||||
// logs.SetLevel(logs.LevelInformational)
|
// logs.SetLevel(logs.LevelInformational)
|
||||||
logs.SetLogFuncCall(false)
|
logs.SetLogFuncCall(false)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user