log: not rotate log file when startup

Signed-off-by: lowzj <[email protected]>
dragonflyoss · Sep 18, 2019 · de058d6 · de058d6
1 parent 9114104
commit de058d6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/cmd/dfdaemon/app/init.go b/cmd/dfdaemon/app/init.go
@@ -83,7 +83,6 @@ func initLogger(cfg config.Properties) error {
 		dflog.WithLogFile(logFilePath),
 		dflog.WithSign(fmt.Sprintf("%d", os.Getpid())),
 		dflog.WithDebug(cfg.Verbose),
-		dflog.WithConsole(),
 	}
 
 	logrus.Debugf("use log file %s", logFilePath)

diff --git a/dfget/core/downloader/p2p_downloader/p2p_downloader.go b/dfget/core/downloader/p2p_downloader/p2p_downloader.go
@@ -188,13 +188,14 @@ func (p2p *P2PDownloader) Run() error {
 			} else if code == constants.CodePeerFinish {
 				p2p.finishTask(response, clientWriter)
 				return nil
-			} else if code == constants.CodePeerWait {
-				continue
-			}
-
-			logrus.Warnf("request piece result:%v", response)
-			if code == constants.CodeSourceError {
-				p2p.cfg.BackSourceReason = config.BackSourceReasonSourceError
+			} else {
+				logrus.Warnf("request piece result:%v", response)
+				if code == constants.CodePeerWait {
+					continue
+				}
+				if code == constants.CodeSourceError {
+					p2p.cfg.BackSourceReason = config.BackSourceReasonSourceError
+				}
 			}
 		}
 

diff --git a/pkg/dflog/log.go b/pkg/dflog/log.go
@@ -61,7 +61,7 @@ func WithLogFile(f string) Option {
 		if logger := getLumberjack(l); logger == nil {
 			l.SetOutput(&lumberjack.Logger{
 				Filename:   f,
-				MaxSize:    20, // mb
+				MaxSize:    40, // mb
 				MaxBackups: 1,
 			})
 		} else {
@@ -124,9 +124,6 @@ func Init(l *logrus.Logger, opts ...Option) error {
 			return err
 		}
 	}
-	if logger, ok := l.Out.(*lumberjack.Logger); ok {
-		return logger.Rotate()
-	}
 	return nil
 }