working with the log file is improved. (#45)

microup · Aug 11, 2023 · 8ae059a · 8ae059a
1 parent cdf629b
commit 8ae059a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/config/config.yaml b/config/config.yaml
@@ -27,5 +27,5 @@ proxy:
 
 logger:
   dirLog: ./logs/
-  fileSize: 10000000
+  fileSizeInMb: 10
   apiShowRecords: 50
diff --git a/internal/config/log.go b/internal/config/log.go
@@ -5,7 +5,7 @@ type Log struct {
 	// directory where log files are stored
 	DirLog string `yaml:"dirLog"`
 	// maximum size of a log file, in megabytes
-	FileSizeMB uint64 `yaml:"fileSizeInMb"`
+	FileSizeMB float64 `yaml:"fileSizeInMb"`
 	// number of records to show when
 	APIShowRecords uint64 `yaml:"apiShowRecords"`
 }
diff --git a/internal/types/consts.go b/internal/types/consts.go
@@ -9,6 +9,8 @@ import (
 const (
 	// LengthByte is the length of a byte.
 	LengthByte = 1024
+	//
+	LengthKilobytesInBytes = 1024
 	// PowX is the power of 10.
 	PowX = 10
 	// RoundOne is the value of 0.5.

diff --git a/internal/vlog/log_files.go b/internal/vlog/log_files.go
@@ -13,8 +13,8 @@ import (
 func (v *VLog) newFileLog(newFileName string, isNewFileLog bool) error {
 	if isNewFileLog {
 		v.MapLastLogRecords = make([]string, 0)
+
 		err := v.Close()
-
 		if err != nil {
 			return err
 		}
@@ -34,7 +34,7 @@ func (v *VLog) newFileLog(newFileName string, isNewFileLog bool) error {
 
 	v.fileLog, err = v.open(newFileName)
 	if v.fileLog == nil || err != nil {
-		return err
+		return fmt.Errorf("%w", err)
 	}
 
 	_, err = v.fileLog.WriteString(v.headerCSV + "\n")
@@ -110,18 +110,21 @@ func (v *VLog) checkToCreateNewLogFile() error {
 	if fileInfo == nil {
 		err = v.newFileLog("", false)
 		if err != nil {
-			return err
+			return fmt.Errorf("%w", err)
 		}
 
 		return nil
 	}
 
-	if uint64(fileInfo.Size()) > v.cfg.FileSizeMB {
+	fileSizeBytes := fileInfo.Size()
+	fileSizeMB := float64(fileSizeBytes) / (types.LengthKilobytesInBytes * types.LengthKilobytesInBytes)
+
+	if fileSizeMB > v.cfg.FileSizeMB {
 		oldFileCSV := v.fileLog.Name()
 
 		err = v.newFileLog("", false)
 		if err != nil {
-			return err
+			return fmt.Errorf("%w", err)
 		}
 
 		err = core.ArchiveFile(oldFileCSV, fmt.Sprintf("_%s.zip", types.LogFileExtension))

diff --git a/internal/vlog/vlog.go b/internal/vlog/vlog.go
@@ -52,7 +52,7 @@ func New(cfg *config.Log) *VLog {
 func (v *VLog) Init() error {
 	err := v.newFileLog("", true)
 	if err != nil {
-		return err
+		return fmt.Errorf("%w", err)
 	}
 
 	return nil