Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions config/loadAuto/auto.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package loadAuto

import (
"fmt"
"log"
"path/filepath"

"helay.net/go/utils/v3/config"
loadIni2 "helay.net/go/utils/v3/config/loadIni"
loadJson2 "helay.net/go/utils/v3/config/loadJson"
"helay.net/go/utils/v3/config/loadYaml"
"helay.net/go/utils/v3/logger/ulogs"
"path/filepath"
)

var (
Expand All @@ -27,13 +29,13 @@ func Load[T any](i T) {
if err = loadFirst(i); err == nil {
return
}
ulogs.Error(err, "配置文件默认解析器计息失败,开始尝试其他解析器")
log.Printf("默认配置解析器解析失败,尝试其他解析器 %v\n", err)
}
for _, v := range loadFunc {
err = v(i)
if err == nil {
return
}
}
ulogs.DieCheckerr(err, "载入配置文件失败")
panic(fmt.Errorf("解析配置文件失败 %v", err))
}
7 changes: 5 additions & 2 deletions config/loadIni/load.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
package loadIni

import (
"fmt"

"gopkg.in/ini.v1"
"helay.net/go/utils/v3/config"
"helay.net/go/utils/v3/logger/ulogs"
"helay.net/go/utils/v3/tools"
)

func LoadIni(i any) {
ulogs.DieCheckerr(LoadIniBase(i), "载入配置文件失败")
if err := LoadIniBase(i); err != nil {
panic(fmt.Errorf("解析配置文件失败 %v", err))
}
}

// LoadIniBase 载入配置基础功能
Expand Down
8 changes: 5 additions & 3 deletions config/loadJson/load.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@ package loadJson
import (
"encoding/json"
"fmt"
"os"

"helay.net/go/utils/v3/close/osClose"
"helay.net/go/utils/v3/config"
"helay.net/go/utils/v3/logger/ulogs"
"helay.net/go/utils/v3/tools"
"os"
)

func LoadJson(i any) {
ulogs.DieCheckerr(LoadJsonBase(i), "解析配置文件失败")
if err := LoadJsonBase(i); err != nil {
panic(fmt.Errorf("解析配置文件失败 %v", err))
}
}

func LoadJsonBase(i any) error {
Expand Down
5 changes: 3 additions & 2 deletions config/loadYaml/load.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ import (
"gopkg.in/yaml.v3"
"helay.net/go/utils/v3/close/osClose"
"helay.net/go/utils/v3/config"
"helay.net/go/utils/v3/logger/ulogs"
"helay.net/go/utils/v3/tools"
"helay.net/go/utils/v3/tools/fileinclude"
)

func LoadYaml(i any) {
ulogs.DieCheckerr(LoadYamlBase(i), "解析配置文件失败")
if err := LoadYamlBase(i); err != nil {
panic(fmt.Errorf("解析配置文件失败 %v", err))
}
}

func LoadYamlBase(i any) error {
Expand Down
5 changes: 3 additions & 2 deletions config/parseCmd/parse.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package parseCmd
import (
"flag"
"fmt"
"log"
"os"

"helay.net/go/utils/v3"
Expand Down Expand Up @@ -57,7 +58,7 @@ func Parseparams(f ...func()) {

// noinspection all
if config.EnableParseParamsLog {
fmt.Println("日志级别", logLevel, ulogs.Level)
ulogs.Log("运行参数解析完成...")
log.Printf("日志级别 %s %d\n", logLevel, ulogs.Level)
log.Println("运行参数解析完成...")
}
}
72 changes: 60 additions & 12 deletions logger/ulogs/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,85 +40,133 @@ func Log(i ...interface{}) {

func Trace(i ...any) {
if Level <= LogLevelTrace {
traceLogger.Println(i...)
entry := globalLogger.getEntry()
entry.logger = globalLogger.traceLogger
entry.args = i
globalLogger.stdoutChan <- entry
}
}

// noinspection all
func Tracef(format string, a ...any) {
if Level <= LogLevelTrace {
traceLogger.Printf(format, a...)
entry := globalLogger.getEntry()
entry.logger = globalLogger.traceLogger
entry.isFormatted = true
entry.format = format
entry.args = a
globalLogger.stdoutChan <- entry
}
}

// Debug 用于记录调试信息
func Debug(i ...any) {
if Level <= LogLevelDebug {
debugLogger.Println(i...)
entry := globalLogger.getEntry()
entry.logger = globalLogger.debugLogger
entry.args = i
globalLogger.stdoutChan <- entry
}
}

// Debugf
// noinspection all
func Debugf(format string, a ...any) {
if Level <= LogLevelDebug {
debugLogger.Printf(format, a...)
entry := globalLogger.getEntry()
entry.logger = globalLogger.debugLogger
entry.isFormatted = true
entry.format = format
entry.args = a
globalLogger.stdoutChan <- entry
}
}

// Info 用于记录信息
func Info(i ...interface{}) {
if Level <= LogLevelInfo {
infoLogger.Println(i...)
entry := globalLogger.getEntry()
entry.logger = globalLogger.infoLogger
entry.args = i
globalLogger.stdoutChan <- entry
}
}

// noinspection all
func Infof(format string, a ...any) {
if Level <= LogLevelInfo {
infoLogger.Printf(format, a...)
entry := globalLogger.getEntry()
entry.logger = globalLogger.infoLogger
entry.isFormatted = true
entry.format = format
entry.args = a
globalLogger.stdoutChan <- entry
}

}

// Warn 用于记录警告信息
func Warn(i ...interface{}) {
if Level <= LogLevelWarn {
warnLogger.Println(i...)
entry := globalLogger.getEntry()
entry.logger = globalLogger.warnLogger
entry.args = i
globalLogger.stderrChan <- entry
}
}

// noinspection all
func Warnf(format string, a ...any) {
if Level <= LogLevelWarn {
warnLogger.Printf(format, a...)
entry := globalLogger.getEntry()
entry.logger = globalLogger.warnLogger
entry.isFormatted = true
entry.format = format
entry.args = a
globalLogger.stderrChan <- entry
}
}

// Error 用于记录错误信息
func Error(i ...interface{}) {
if Level <= LogLevelError {
errorLogger.Println(i...)
entry := globalLogger.getEntry()
entry.logger = globalLogger.errorLogger
entry.args = i
globalLogger.stderrChan <- entry
}
}

func Errorf(format string, a ...any) {
if Level <= LogLevelError {
errorLogger.Printf(format, a...)
entry := globalLogger.getEntry()
entry.logger = globalLogger.errorLogger
entry.isFormatted = true
entry.format = format
entry.args = a
globalLogger.stderrChan <- entry
}
}

// Fatal 用于记录致命错误信息
func Fatal(i ...interface{}) {
if Level <= LogLevelFatal {
fatalLogger.Println(i...)
entry := globalLogger.getEntry()
entry.logger = globalLogger.fatalLogger
entry.args = i
globalLogger.stderrChan <- entry
}
}

// noinspection all
func Fatalf(format string, a ...any) {
if Level <= LogLevelFatal {
fatalLogger.Printf(format, a...)
entry := globalLogger.getEntry()
entry.logger = globalLogger.fatalLogger
entry.isFormatted = true
entry.format = format
entry.args = a
globalLogger.stderrChan <- entry
}
}

Expand Down
Loading