bunch of probably useless micro optimisation

This commit is contained in:
simon987
2019-01-29 21:35:31 -05:00
parent 58f20aa33d
commit d3188c512d
11 changed files with 153 additions and 98 deletions

View File

@@ -7,11 +7,24 @@ import (
)
type LogEntry struct {
Message string `json:"message"`
Timestamp int64 `json:"timestamp"`
Data string `json:"data"`
Level string `json:"level"`
Message string `json:"message"`
Timestamp int64 `json:"timestamp"`
Data string `json:"data"`
Level LogLevel `json:"level"`
}
type LogLevel int
const (
FATAL LogLevel = 1
PANIC LogLevel = 2
ERROR LogLevel = 3
WARN LogLevel = 4
INFO LogLevel = 5
DEBUG LogLevel = 6
TRACE LogLevel = 7
)
type sqlLogHook struct {
database *Database
}
@@ -29,8 +42,27 @@ func (h sqlLogHook) Fire(entry *logrus.Entry) error {
return err
}
var logLevel LogLevel
switch entry.Level {
case logrus.TraceLevel:
logLevel = TRACE
case logrus.DebugLevel:
logLevel = DEBUG
case logrus.InfoLevel:
logLevel = INFO
case logrus.WarnLevel:
logLevel = WARN
case logrus.ErrorLevel:
logLevel = ERROR
case logrus.FatalLevel:
logLevel = FATAL
case logrus.PanicLevel:
logLevel = PANIC
}
_, err = db.Exec("INSERT INTO log_entry (message, level, message_data, timestamp) VALUES ($1,$2,$3,$4)",
entry.Message, entry.Level.String(), jsonData, entry.Time.Unix())
entry.Message, logLevel, jsonData, entry.Time.Unix())
return err
}
@@ -40,14 +72,14 @@ func (database *Database) SetupLoggerHook() {
logrus.AddHook(hook)
}
func (database *Database) GetLogs(since int64, level logrus.Level) *[]LogEntry {
func (database *Database) GetLogs(since int64, level LogLevel) *[]LogEntry {
db := database.getDB()
var logs []LogEntry
rows, err := db.Query("SELECT * FROM log_entry WHERE timestamp > $1 AND level=$2",
since, level.String())
since, level)
handleErr(err)
for rows.Next() {