From 276a4433f1994583814d3f312eb1036c0f962d50 Mon Sep 17 00:00:00 2001
From: W192547975 <138874985+W192547975@users.noreply.github.com>
Date: Thu, 10 Aug 2023 11:23:36 +0800
Subject: [PATCH] Bitset logmode update (#40)

* Update log.go

bitset loglevel

---------

Co-authored-by: OpenP2P <89245779+TenderIronh@users.noreply.github.com>
---
 core/log.go     | 11 +++++------
 core/openp2p.go |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/core/log.go b/core/log.go
index dd4f730..cda5595 100644
--- a/core/log.go
+++ b/core/log.go
@@ -36,9 +36,8 @@ func init() {
 }
 
 const (
-	LogFile = iota
+	LogFile = 1 << iota
 	LogConsole
-	LogFileAndConsole
 )
 
 type logger struct {
@@ -140,10 +139,10 @@ func (l *logger) Printf(level LogLevel, format string, params ...interface{}) {
 	}
 	pidAndLevel := []interface{}{l.pid, loglevel[level]}
 	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...)
 	}
-	if l.mode == LogConsole || l.mode == LogFileAndConsole {
+	if l.mode & LogConsole != 0 {
 		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], " "}
 	params = append(pidAndLevel, params...)
 	params = append(params, l.lineEnding)
-	if l.mode == LogFile || l.mode == LogFileAndConsole {
+	if l.mode & LogFile != 0 {
 		l.loggers[0].Print(params...)
 	}
-	if l.mode == LogConsole || l.mode == LogFileAndConsole {
+	if l.mode & LogConsole != 0 {
 		l.stdLogger.Print(params...)
 	}
 }
diff --git a/core/openp2p.go b/core/openp2p.go
index cdd9023..e3770fa 100644
--- a/core/openp2p.go
+++ b/core/openp2p.go
@@ -13,7 +13,7 @@ func Run() {
 	rand.Seed(time.Now().UnixNano())
 	baseDir := filepath.Dir(os.Args[0])
 	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
 	if len(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 {
 	rand.Seed(time.Now().UnixNano())
 	os.Chdir(baseDir) // for system service
-	gLog = NewLogger(baseDir, ProductName, LvDEBUG, 1024*1024, LogFileAndConsole)
+	gLog = NewLogger(baseDir, ProductName, LvDEBUG, 1024*1024, LogFile|LogConsole)
 
 	parseParams("")