diff --git a/conf/conf.go b/conf/conf.go index 63c6a951..41771357 100644 --- a/conf/conf.go +++ b/conf/conf.go @@ -15,7 +15,7 @@ package conf import ( - "encoding/json" + "fmt" "os" "runtime" "strconv" @@ -24,15 +24,6 @@ import ( "github.com/beego/beego" ) -type Quota struct { - Organization int `json:"organization"` - User int `json:"user"` - Application int `json:"application"` - Provider int `json:"provider"` -} - -var quota = &Quota{-1, -1, -1, -1} - func init() { // this array contains the beego configuration items that may be modified via env presetConfigItems := []string{"httpport", "appname"} @@ -44,17 +35,6 @@ func init() { } } } - initQuota() -} - -func initQuota() { - res := beego.AppConfig.String("quota") - if res != "" { - err := json.Unmarshal([]byte(res), quota) - if err != nil { - panic(err) - } - } } func GetConfigString(key string) string { @@ -67,7 +47,7 @@ func GetConfigString(key string) string { if key == "staticBaseUrl" { res = "https://cdn.casbin.org" } else if key == "logConfig" { - res = "{\"filename\": \"logs/casdoor.log\", \"maxdays\":99999, \"perm\":\"0770\"}" + res = fmt.Sprintf("{\"filename\": \"logs/%s.log\", \"maxdays\":99999, \"perm\":\"0770\"}", beego.AppConfig.String("appname")) } } @@ -129,10 +109,6 @@ func GetConfigBatchSize() int { return res } -func GetConfigQuota() *Quota { - return quota -} - func GetConfigRealDataSourceName(driverName string) string { var dataSourceName string if driverName != "mysql" { diff --git a/conf/conf_quota.go b/conf/conf_quota.go new file mode 100644 index 00000000..0ed99f93 --- /dev/null +++ b/conf/conf_quota.go @@ -0,0 +1,48 @@ +// Copyright 2023 The Casdoor Authors. All Rights Reserved. +// +// Licensed 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. + +package conf + +import ( + "encoding/json" + + "github.com/beego/beego" +) + +type Quota struct { + Organization int `json:"organization"` + User int `json:"user"` + Application int `json:"application"` + Provider int `json:"provider"` +} + +var quota = &Quota{-1, -1, -1, -1} + +func init() { + initQuota() +} + +func initQuota() { + res := beego.AppConfig.String("quota") + if res != "" { + err := json.Unmarshal([]byte(res), quota) + if err != nil { + panic(err) + } + } +} + +func GetConfigQuota() *Quota { + return quota +}