logger模块移入go-admin-core仓库,修改log用法暂时折中

fixme:后期要尽快改成统一的log处理方式
This commit is contained in:
linwenxiang committed 2020-10-26 22:37:44 +08:00
1 parent a68e58f93b
commit da4637d285
27 files changed
+119 -784

No files matched your search

+36
View File
@@ -0,0 +1,36 @@
package mycasbin
import (
"sync/atomic"
"github.com/go-admin-team/go-admin-core/logger"
)
// Logger is the implementation for a Logger using golang log.
type Logger struct {
enable int32
}
func (l *Logger) EnableLog(enable bool) {
i := 0
if enable {
i = 1
}
atomic.StoreInt32(&(l.enable), int32(i))
}
func (l *Logger) IsEnabled() bool {
return atomic.LoadInt32(&(l.enable)) != 0
}
func (l *Logger) Print(v ...interface{}) {
if l.IsEnabled() {
logger.DefaultLogger.Log(logger.InfoLevel, v...)
}
}
func (l *Logger) Printf(format string, v ...interface{}) {
if l.IsEnabled() {
logger.DefaultLogger.Logf(logger.InfoLevel, format, v...)
}
}
+7 -20
View File
@@ -1,14 +1,11 @@
package mycasbin
import (
"log"
"github.com/casbin/casbin/v2"
"github.com/casbin/casbin/v2/log"
"github.com/casbin/casbin/v2/model"
gormAdapter "github.com/casbin/gorm-adapter/v3"
_ "github.com/go-sql-driver/mysql"
"go-admin/common/global"
"gorm.io/gorm"
)
// Initialize the model from a string.
@@ -26,8 +23,8 @@ e = some(where (p.eft == allow))
m = r.sub == p.sub && (keyMatch2(r.obj, p.obj) || keyMatch(r.obj, p.obj)) && (r.act == p.act || p.act == "*")
`
func Setup() {
Apter, err := gormAdapter.NewAdapterByDBUsePrefix(global.Eloquent, "sys_")
func Setup(db *gorm.DB, prefix string) *casbin.SyncedEnforcer {
Apter, err := gormAdapter.NewAdapterByDBUsePrefix(db, prefix)
if err != nil {
panic(err)
}
@@ -43,18 +40,8 @@ func Setup() {
if err != nil {
panic(err)
}
global.CasbinEnforcer = e
}
func Casbin() *casbin.SyncedEnforcer {
return global.CasbinEnforcer
}
func LoadPolicy() (*casbin.SyncedEnforcer, error) {
if err := global.CasbinEnforcer.LoadPolicy(); err == nil {
return global.CasbinEnforcer, err
} else {
log.Printf("casbin rbac_model or policy init error, message: %v \r\n", err.Error())
return nil, err
}
log.SetLogger(&Logger{})
e.EnableLog(true)
return e
}
+6 -9
View File
@@ -2,16 +2,16 @@ package logger
import (
"github.com/gogf/gf/os/glog"
"go-admin/common/global"
"go-admin/tools"
"go-admin/tools/config"
)
var Logger *glog.Logger
var JobLogger *glog.Logger
var RequestLogger *glog.Logger
func Setup() (*glog.Logger, *glog.Logger, *glog.Logger) {
var Logger *glog.Logger
var JobLogger *glog.Logger
var RequestLogger *glog.Logger
func Setup() {
Logger = glog.New()
_ = Logger.SetPath(config.LoggerConfig.Path + "/bus")
Logger.SetStdoutPrint(config.LoggerConfig.EnabledBUS && config.LoggerConfig.Stdout)
@@ -31,8 +31,5 @@ func Setup() {
_ = RequestLogger.SetLevelStr(config.LoggerConfig.Level)
Logger.Info(tools.Green("Logger init success!"))
global.Logger = Logger.Line()
global.JobLogger = JobLogger.Line()
global.RequestLogger = RequestLogger.Line()
return Logger, JobLogger, RequestLogger
}