Skip to content

Add postgres format logs #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Add postgres format logs #5

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fd4068e
Add postgres format logs
deffer1337 Jan 22, 2023
706a2db
Fix NewLogLevelError
deffer1337 Jan 22, 2023
00e3507
Fixiki
deffer1337 Jan 23, 2023
764866d
Delete Error Logger
deffer1337 Jan 24, 2023
8536e6c
Refactoring
deffer1337 Jan 25, 2023
64e0c2f
Refactoring
deffer1337 Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 0 additions & 56 deletions error_logger.go
View file
Open in desktop

This file was deleted.

65 changes: 48 additions & 17 deletions logging.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,28 @@ package tracelog

import (
"fmt"
"io/ioutil"
"log"
"os"

"github.com/pkg/errors"
"io/ioutil"
"strings"
)

const (
NormalLogLevel = "NORMAL"
DevelLogLevel = "DEVEL"
ErrorLogLevel = "ERROR"
timeFlags = log.LstdFlags | log.Lmicroseconds
)

var InfoLogger = NewErrorLogger(os.Stdout, "INFO: ")
var WarningLogger = NewErrorLogger(os.Stdout, "WARNING: ")
var ErrorLogger = NewErrorLogger(os.Stderr, "ERROR: ")
var DebugLogger = NewErrorLogger(ioutil.Discard, "DEBUG: ")
const (
CsvPg = "CSV PG"
JsonPg = "JSON PG"
TextPg = "TEXT PG"
TextWalg = "TEXT WALG"
)

var InfoLogger = NewLogger(GetFieldValuesForWalg(InfoLoggerType), WalgDefaultWriter)
var WarningLogger = NewLogger(GetFieldValuesForWalg(WarningLoggerType), WalgDefaultWriter)
var ErrorLogger = NewLogger(GetFieldValuesForWalg(ErrorLoggerType), WalgDefaultWriter)
var DebugLogger = NewLogger(GetFieldValuesForWalg(DebugLoggerType), NewTextWriter(ioutil.Discard, WalgTextFormatForDebug, WalgTextFormatFields))

var LogLevels = []string{NormalLogLevel, DevelLogLevel, ErrorLogLevel}
var logLevel = NormalLogLevel
Expand All @@ -29,15 +33,18 @@ var logLevelFormatters = map[string]string{
DevelLogLevel: "%+v",
}

var LogWriters = []string{CsvPg, JsonPg, TextPg, TextWalg}
var logWriter = TextWalg

func setupLoggers() {
if logLevel == NormalLogLevel {
DebugLogger = NewErrorLogger(ioutil.Discard, "DEBUG: ")
} else if logLevel == ErrorLogLevel {
DebugLogger = NewErrorLogger(ioutil.Discard, "DEBUG: ")
InfoLogger = NewErrorLogger(ioutil.Discard, "INFO: ")
WarningLogger = NewErrorLogger(ioutil.Discard, "WARNING: ")
} else {
DebugLogger = NewErrorLogger(os.Stdout, "DEBUG: ")
if logWriter == TextWalg {
setupWalgLoggers()
} else if logWriter == JsonPg {
setupJsonPgLoggers()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why need to use separate functions? Can we just setup the writer and field values and then send it to setupLoggers()?

} else if logWriter == CsvPg {
setupCsvPgLoggers()
} else if logWriter == TextPg {
setupTextPgLoggers()
}
}

Expand All @@ -49,6 +56,14 @@ func NewLogLevelError(incorrectLogLevel string) LogLevelError {
return LogLevelError{errors.Errorf("got incorrect log level: '%s', expected one of: '%v'", incorrectLogLevel, LogLevels)}
}

type LogWriterError struct {
error
}

func NewLogWriterError(incorrectLogWriter string) LogWriterError {
return LogWriterError{errors.Errorf("got incorrect log writer: '%s', expected one of: '%v'", incorrectLogWriter, strings.Join(LogWriters[:], ","))}
}

func (err LogLevelError) Error() string {
return fmt.Sprintf(GetErrorFormatter(), err.error)
}
Expand All @@ -72,3 +87,19 @@ func UpdateLogLevel(newLevel string) error {
setupLoggers()
return nil
}

func UpdateLogWriter(newWriter string) error {
isCorrect := false
for _, logWriter := range LogWriters {
if newWriter == logWriter {
isCorrect = true
}
}
if !isCorrect {
return NewLogWriterError(newWriter)
}

logWriter = newWriter
setupLoggers()
return nil
}
70 changes: 59 additions & 11 deletions postgres_logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,10 @@ import (
"time"
)

type PostgresLogger struct {
*Logger
}

var BasicFormat = "%s [%d] %s: %s"
var BasicFields = []string{"timestamp", "pid", "error_severity", "message"}
var PgFormat = "%s [%d] %s: %s"
var PgFields = []string{"timestamp", "pid", "error_severity", "message"}

func GetFieldValues(loggerType LoggerType) func() Fields {
func GetFieldValuesForPg(loggerType LoggerType) func() Fields {
return func() Fields {
now := time.Now().UTC()
fields := Fields{
Expand All @@ -26,7 +22,59 @@ func GetFieldValues(loggerType LoggerType) func() Fields {
}
}

var InfoPostgresLogger = NewLogger(GetFieldValues(InfoLoggerType), NewTextWriter(os.Stderr, BasicFormat, BasicFields))
var WarningPostgresLogger = NewLogger(GetFieldValues(WarningLoggerType), NewTextWriter(os.Stderr, BasicFormat, BasicFields))
var ErrorPostgresLogger = NewLogger(GetFieldValues(ErrorLoggerType), NewTextWriter(os.Stderr, BasicFormat, BasicFields))
var DebugPostgresLogger = NewLogger(GetFieldValues(DebugLoggerType), NewTextWriter(ioutil.Discard, BasicFormat, BasicFields))
func setupJsonPgLoggers() {
if logLevel == NormalLogLevel {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

DebugLogger = NewLogger(GetFieldValuesForPg(DebugLoggerType), NewJsonWriter(ioutil.Discard))
InfoLogger = NewLogger(GetFieldValuesForPg(InfoLoggerType), NewJsonWriter(os.Stderr))
WarningLogger = NewLogger(GetFieldValuesForPg(WarningLoggerType), NewJsonWriter(os.Stderr))
ErrorLogger = NewLogger(GetFieldValuesForPg(ErrorLoggerType), NewJsonWriter(os.Stderr))
} else if logLevel == ErrorLogLevel {
ErrorLogger = NewLogger(GetFieldValuesForPg(ErrorLoggerType), NewJsonWriter(os.Stderr))
DebugLogger = NewLogger(GetFieldValuesForPg(DebugLoggerType), NewJsonWriter(ioutil.Discard))
InfoLogger = NewLogger(GetFieldValuesForPg(InfoLoggerType), NewJsonWriter(ioutil.Discard))
WarningLogger = NewLogger(GetFieldValuesForPg(WarningLoggerType), NewJsonWriter(ioutil.Discard))
} else {
DebugLogger = NewLogger(GetFieldValuesForPg(DebugLoggerType), NewJsonWriter(os.Stdout))
InfoLogger = NewLogger(GetFieldValuesForPg(InfoLoggerType), NewJsonWriter(os.Stderr))
WarningLogger = NewLogger(GetFieldValuesForPg(WarningLoggerType), NewJsonWriter(os.Stderr))
ErrorLogger = NewLogger(GetFieldValuesForPg(ErrorLoggerType), NewJsonWriter(os.Stderr))
}
}

func setupTextPgLoggers() {
if logLevel == NormalLogLevel {
DebugLogger = NewLogger(GetFieldValuesForPg(DebugLoggerType), NewTextWriter(ioutil.Discard, PgFormat, PgFields))
InfoLogger = NewLogger(GetFieldValuesForPg(InfoLoggerType), NewTextWriter(os.Stderr, PgFormat, PgFields))
WarningLogger = NewLogger(GetFieldValuesForPg(WarningLoggerType), NewTextWriter(os.Stderr, PgFormat, PgFields))
ErrorLogger = NewLogger(GetFieldValuesForPg(ErrorLoggerType), NewTextWriter(os.Stderr, PgFormat, PgFields))
} else if logLevel == ErrorLogLevel {
ErrorLogger = NewLogger(GetFieldValuesForPg(ErrorLoggerType), NewTextWriter(os.Stderr, PgFormat, PgFields))
DebugLogger = NewLogger(GetFieldValuesForPg(DebugLoggerType), NewTextWriter(ioutil.Discard, PgFormat, PgFields))
InfoLogger = NewLogger(GetFieldValuesForPg(InfoLoggerType), NewTextWriter(ioutil.Discard, PgFormat, PgFields))
WarningLogger = NewLogger(GetFieldValuesForPg(WarningLoggerType), NewTextWriter(ioutil.Discard, PgFormat, PgFields))
} else {
DebugLogger = NewLogger(GetFieldValuesForPg(DebugLoggerType), NewTextWriter(os.Stdout, PgFormat, PgFields))
InfoLogger = NewLogger(GetFieldValuesForPg(InfoLoggerType), NewTextWriter(os.Stderr, PgFormat, PgFields))
WarningLogger = NewLogger(GetFieldValuesForPg(WarningLoggerType), NewTextWriter(os.Stderr, PgFormat, PgFields))
ErrorLogger = NewLogger(GetFieldValuesForPg(ErrorLoggerType), NewTextWriter(os.Stderr, PgFormat, PgFields))
}
}

func setupCsvPgLoggers() {
if logLevel == NormalLogLevel {
DebugLogger = NewLogger(GetFieldValuesForPg(DebugLoggerType), NewCsvWriter(ioutil.Discard, PgFields))
InfoLogger = NewLogger(GetFieldValuesForPg(InfoLoggerType), NewCsvWriter(os.Stderr, PgFields))
WarningLogger = NewLogger(GetFieldValuesForPg(WarningLoggerType), NewCsvWriter(os.Stderr, PgFields))
ErrorLogger = NewLogger(GetFieldValuesForPg(ErrorLoggerType), NewCsvWriter(os.Stderr, PgFields))
} else if logLevel == ErrorLogLevel {
ErrorLogger = NewLogger(GetFieldValuesForPg(ErrorLoggerType), NewCsvWriter(os.Stderr, PgFields))
DebugLogger = NewLogger(GetFieldValuesForPg(DebugLoggerType), NewCsvWriter(ioutil.Discard, PgFields))
InfoLogger = NewLogger(GetFieldValuesForPg(InfoLoggerType), NewCsvWriter(ioutil.Discard, PgFields))
WarningLogger = NewLogger(GetFieldValuesForPg(WarningLoggerType), NewCsvWriter(ioutil.Discard, PgFields))
} else {
DebugLogger = NewLogger(GetFieldValuesForPg(DebugLoggerType), NewCsvWriter(os.Stdout, PgFields))
InfoLogger = NewLogger(GetFieldValuesForPg(InfoLoggerType), NewCsvWriter(os.Stderr, PgFields))
WarningLogger = NewLogger(GetFieldValuesForPg(WarningLoggerType), NewCsvWriter(os.Stderr, PgFields))
ErrorLogger = NewLogger(GetFieldValuesForPg(ErrorLoggerType), NewCsvWriter(os.Stderr, PgFields))
}
}
43 changes: 43 additions & 0 deletions walg_logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package tracelog

import (
"io/ioutil"
"os"
"time"
)

var WalgTextFormat = "%s: %s %v"
var WalgTextFormatForDebug = "%s: %s %+v"
var WalgTextFormatFields = []string{"level", "time", "message"}
var WalgDefaultWriter = NewTextWriter(os.Stderr, WalgTextFormat, WalgTextFormatFields)

func GetFieldValuesForWalg(loggerType LoggerType) func() Fields {
return func() Fields {
now := time.Now()
fields := Fields{
"level": loggerType,
"time": now.Format("2006/01/02 03:04:05.000000"),
}

return fields
}
}

func setupWalgLoggers() {
if logLevel == NormalLogLevel {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the only difference is the destinations for debug/info/error loggers, other code must not be duplicated.

DebugLogger = NewLogger(GetFieldValuesForWalg(DebugLoggerType), NewTextWriter(ioutil.Discard, WalgTextFormat, WalgTextFormatFields))
InfoLogger = NewLogger(GetFieldValuesForWalg(InfoLoggerType), NewTextWriter(os.Stderr, WalgTextFormat, WalgTextFormatFields))
WarningLogger = NewLogger(GetFieldValuesForWalg(WarningLoggerType), NewTextWriter(os.Stderr, WalgTextFormat, WalgTextFormatFields))
ErrorLogger = NewLogger(GetFieldValuesForWalg(ErrorLoggerType), NewTextWriter(os.Stderr, WalgTextFormat, WalgTextFormatFields))
} else if logLevel == ErrorLogLevel {
ErrorLogger = NewLogger(GetFieldValuesForWalg(ErrorLoggerType), NewTextWriter(os.Stderr, WalgTextFormat, WalgTextFormatFields))
DebugLogger = NewLogger(GetFieldValuesForWalg(DebugLoggerType), NewTextWriter(ioutil.Discard, WalgTextFormat, WalgTextFormatFields))
InfoLogger = NewLogger(GetFieldValuesForWalg(InfoLoggerType), NewTextWriter(ioutil.Discard, WalgTextFormat, WalgTextFormatFields))
WarningLogger = NewLogger(GetFieldValuesForWalg(WarningLoggerType), NewTextWriter(ioutil.Discard, WalgTextFormat, WalgTextFormatFields))
} else {
DebugLogger = NewLogger(GetFieldValuesForWalg(DebugLoggerType), NewTextWriter(os.Stdout, WalgTextFormat, WalgTextFormatFields))
InfoLogger = NewLogger(GetFieldValuesForWalg(InfoLoggerType), NewTextWriter(os.Stderr, WalgTextFormat, WalgTextFormatFields))
WarningLogger = NewLogger(GetFieldValuesForWalg(WarningLoggerType), NewTextWriter(os.Stderr, WalgTextFormat, WalgTextFormatFields))
ErrorLogger = NewLogger(GetFieldValuesForWalg(ErrorLoggerType), NewTextWriter(os.Stderr, WalgTextFormat, WalgTextFormatFields))
}
}