yeyinlaoying/openp2p
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bitset logmode update (#40)

Browse Source 
* Update log.go

bitset loglevel

---------

Co-authored-by: OpenP2P <[email protected]>
This commit is contained in:
W192547975
2023-08-10 11:23:36 +08:00
committed by GitHub
co-authored by OpenP2P
parent e21adebc26
commit 276a4433f1
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/log.go
+5 -6
View File
@@ -36,9 +36,8 @@ func init() {
} }
const ( const (
LogFile = iota LogFile = 1 << iota
LogConsole LogConsole
LogFileAndConsole
) )
type logger struct { type logger struct {
@@ -140,10 +139,10 @@ func (l *logger) Printf(level LogLevel, format string, params ...interface{}) {
} }
pidAndLevel := []interface{}{l.pid, loglevel[level]} pidAndLevel := []interface{}{l.pid, loglevel[level]}
params = append(pidAndLevel, params...) params = append(pidAndLevel, params...)
if l.mode == LogFile || l.mode == LogFileAndConsole { if l.mode & LogFile != 0 {
l.loggers[0].Printf("%d %s "+format+l.lineEnding, params...) l.loggers[0].Printf("%d %s "+format+l.lineEnding, params...)
} }
if l.mode == LogConsole || l.mode == LogFileAndConsole { if l.mode & LogConsole != 0 {
l.stdLogger.Printf("%d %s "+format+l.lineEnding, params...) l.stdLogger.Printf("%d %s "+format+l.lineEnding, params...)
} }
} }
@@ -157,10 +156,10 @@ func (l *logger) Println(level LogLevel, params ...interface{}) {
pidAndLevel := []interface{}{l.pid, " ", loglevel[level], " "} pidAndLevel := []interface{}{l.pid, " ", loglevel[level], " "}
params = append(pidAndLevel, params...) params = append(pidAndLevel, params...)
params = append(params, l.lineEnding) params = append(params, l.lineEnding)
if l.mode == LogFile || l.mode == LogFileAndConsole { if l.mode & LogFile != 0 {
l.loggers[0].Print(params...) l.loggers[0].Print(params...)
} }
if l.mode == LogConsole || l.mode == LogFileAndConsole { if l.mode & LogConsole != 0 {
l.stdLogger.Print(params...) l.stdLogger.Print(params...)
} }
} }
core/openp2p.go
+2 -2
View File
@@ -13,7 +13,7 @@ func Run() {
rand.Seed(time.Now().UnixNano()) rand.Seed(time.Now().UnixNano())
baseDir := filepath.Dir(os.Args[0]) baseDir := filepath.Dir(os.Args[0])
os.Chdir(baseDir) // for system service os.Chdir(baseDir) // for system service
gLog = NewLogger(baseDir, ProductName, LvDEBUG, 1024*1024, LogFileAndConsole) gLog = NewLogger(baseDir, ProductName, LvDEBUG, 1024*1024, LogFile|LogConsole)
// TODO: install sub command, deamon process // TODO: install sub command, deamon process
if len(os.Args) > 1 { if len(os.Args) > 1 {
switch os.Args[1] { switch os.Args[1] {
@@ -73,7 +73,7 @@ var network *P2PNetwork
func RunAsModule(baseDir string, token string, bw int, logLevel int) *P2PNetwork { func RunAsModule(baseDir string, token string, bw int, logLevel int) *P2PNetwork {
rand.Seed(time.Now().UnixNano()) rand.Seed(time.Now().UnixNano())
os.Chdir(baseDir) // for system service os.Chdir(baseDir) // for system service
gLog = NewLogger(baseDir, ProductName, LvDEBUG, 1024*1024, LogFileAndConsole) gLog = NewLogger(baseDir, ProductName, LvDEBUG, 1024*1024, LogFile|LogConsole)
parseParams("") parseParams("")