mirror of
https://github.com/grafana/grafana.git
synced 2025-02-03 20:21:01 -06:00
fix(build): windows, another windows build fix, #5370
This commit is contained in:
parent
b039a81375
commit
b06ec734f1
@ -179,17 +179,7 @@ func ReadLoggingConfig(modes []string, logsPath string, cfg *ini.File) {
|
|||||||
loggersToClose = append(loggersToClose, fileHandler)
|
loggersToClose = append(loggersToClose, fileHandler)
|
||||||
handler = fileHandler
|
handler = fileHandler
|
||||||
case "syslog":
|
case "syslog":
|
||||||
sysLogHandler := NewSyslog()
|
sysLogHandler := NewSyslog(sec, format)
|
||||||
sysLogHandler.Format = format
|
|
||||||
sysLogHandler.Network = sec.Key("network").MustString("")
|
|
||||||
sysLogHandler.Address = sec.Key("address").MustString("")
|
|
||||||
sysLogHandler.Facility = sec.Key("facility").MustString("local7")
|
|
||||||
sysLogHandler.Tag = sec.Key("tag").MustString("")
|
|
||||||
|
|
||||||
if err := sysLogHandler.Init(); err != nil {
|
|
||||||
Root.Error("Failed to init syslog log handler", "error", err)
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
|
|
||||||
loggersToClose = append(loggersToClose, sysLogHandler)
|
loggersToClose = append(loggersToClose, sysLogHandler)
|
||||||
handler = sysLogHandler
|
handler = sysLogHandler
|
||||||
|
@ -5,8 +5,10 @@ package log
|
|||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"log/syslog"
|
"log/syslog"
|
||||||
|
"os"
|
||||||
|
|
||||||
"github.com/inconshreveable/log15"
|
"github.com/inconshreveable/log15"
|
||||||
|
"gopkg.in/ini.v1"
|
||||||
)
|
)
|
||||||
|
|
||||||
type SysLogHandler struct {
|
type SysLogHandler struct {
|
||||||
@ -18,10 +20,23 @@ type SysLogHandler struct {
|
|||||||
Format log15.Format
|
Format log15.Format
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewSyslog() *SysLogHandler {
|
func NewSyslog(sec *ini.Section, format log15.Format) *SysLogHandler {
|
||||||
return &SysLogHandler{
|
handler := &SysLogHandler{
|
||||||
Format: log15.LogfmtFormat(),
|
Format: log15.LogfmtFormat(),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
handler.Format = format
|
||||||
|
handler.Network = sec.Key("network").MustString("")
|
||||||
|
handler.Address = sec.Key("address").MustString("")
|
||||||
|
handler.Facility = sec.Key("facility").MustString("local7")
|
||||||
|
handler.Tag = sec.Key("tag").MustString("")
|
||||||
|
|
||||||
|
if err := handler.Init(); err != nil {
|
||||||
|
Root.Error("Failed to init syslog log handler", "error", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
return handler
|
||||||
}
|
}
|
||||||
|
|
||||||
func (sw *SysLogHandler) Init() error {
|
func (sw *SysLogHandler) Init() error {
|
||||||
|
@ -2,19 +2,18 @@
|
|||||||
|
|
||||||
package log
|
package log
|
||||||
|
|
||||||
import "github.com/inconshreveable/log15"
|
import (
|
||||||
|
"github.com/inconshreveable/log15"
|
||||||
|
"gopkg.in/ini.v1"
|
||||||
|
)
|
||||||
|
|
||||||
type SysLogHandler struct {
|
type SysLogHandler struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewSyslog() *SysLogHandler {
|
func NewSyslog(sec *ini.Section, format log15.Format) *SysLogHandler {
|
||||||
return &SysLogHandler{}
|
return &SysLogHandler{}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (sw *SysLogHandler) Init() error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (sw *SysLogHandler) Log(r *log15.Record) error {
|
func (sw *SysLogHandler) Log(r *log15.Record) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user