Skip to content

Commit

Permalink
remove lumberjeck log rotator
Browse files Browse the repository at this point in the history
  • Loading branch information
ykomissarov committed Mar 26, 2019
1 parent d5b0325 commit b9f2f48
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 56 deletions.
10 changes: 1 addition & 9 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 5 additions & 45 deletions logger/logManager.go
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
package logger

import (
"encoding/json"
"fmt"
"github.com/integration-system/isp-lib/utils"
"github.com/sirupsen/logrus"
"github.com/x-cray/logrus-prefixed-formatter"
"github.com/integration-system/isp-lib/utils"
"gopkg.in/natefinch/lumberjack.v2"
"io/ioutil"
"log"
"os"
"strings"
"time"
)

const (
Expand All @@ -28,16 +23,15 @@ type log2LogrusWriter struct {
}

func (w *log2LogrusWriter) Write(b []byte) (int, error) {
s := strings.Replace(string(b), " stack=", "\nstack", -1)
return os.Stdout.WriteString(s)
return os.Stdout.Write(b)
}

func init() {
terminalLogger = logrus.New()
terminalFormatter := &prefixed.TextFormatter{
ForceFormatting: true,
DisableColors: true,
//ForceColors: true,
ForceFormatting: true,
DisableColors: !utils.DEV,
ForceColors: utils.DEV,
FullTimestamp: true,
DisableTimestamp: false,
TimestampFormat: defaultTsFormat,
Expand All @@ -62,40 +56,6 @@ func init() {
terminalLogger.SetOutput(&log2LogrusWriter{})
terminalLogger.AddHook(defaultHook())

if utils.FileLoggerConfig != "" {
if bytes, err := ioutil.ReadFile(utils.FileLoggerConfig); err == nil {
lj := &lumberjack.Logger{}
if json.Unmarshal(bytes, lj); err == nil {
fileLogger = logrus.New()
fileFormatter := &prefixed.TextFormatter{
ForceFormatting: true,
FullTimestamp: true,
DisableTimestamp: false,
TimestampFormat: defaultTsFormat,
QuoteCharacter: "",
}
fileLogger.Formatter = fileFormatter
fileLogger.SetOutput(lj)
fileLogger.AddHook(defaultHook())
if err := lj.Rotate(); err != nil {
Warn(err)
}
go func() {
for {
<-time.After(24 * time.Hour)
if err := lj.Rotate(); err != nil {
Warn(err)
}
}
}()
} else {
log.Println("Could not read file logger config", err)
}
} else {
log.Println("Could not read file logger config", err)
}
}

if utils.DEV {
SetLevel(logrus.DebugLevel.String())
} else {
Expand Down
2 changes: 0 additions & 2 deletions utils/constant.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ var (
EnvMigrationPath = os.Getenv("APP_MIGRATION_PATH")
DEV = strings.ToLower(os.Getenv("APP_MODE")) == "dev"
LOG_LEVEL = os.Getenv("LOG_LEVEL")

FileLoggerConfig = os.Getenv("LOG_CONFIG")
)

const (
Expand Down

0 comments on commit b9f2f48

Please sign in to comment.