mirror of
https://github.com/netbirdio/netbird.git
synced 2026-04-18 16:26:38 +00:00
[management, reverse proxy] Add reverse proxy feature (#5291)
* implement reverse proxy --------- Co-authored-by: Alisdair MacLeod <git@alisdairmacleod.co.uk> Co-authored-by: mlsmaycon <mlsmaycon@gmail.com> Co-authored-by: Eduard Gert <kontakt@eduardgert.de> Co-authored-by: Viktor Liu <viktor@netbird.io> Co-authored-by: Diego Noguês <diego.sure@gmail.com> Co-authored-by: Diego Noguês <49420+diegocn@users.noreply.github.com> Co-authored-by: Bethuel Mmbaga <bethuelmbaga12@gmail.com> Co-authored-by: Zoltan Papp <zoltan.pmail@gmail.com> Co-authored-by: Ashley Mensah <ashleyamo982@gmail.com>
This commit is contained in:
29
util/log.go
29
util/log.go
@@ -30,9 +30,14 @@ var (
|
||||
|
||||
// InitLog parses and sets log-level input
|
||||
func InitLog(logLevel string, logs ...string) error {
|
||||
return InitLogger(log.StandardLogger(), logLevel, logs...)
|
||||
}
|
||||
|
||||
// InitLogger parses and sets log-level input for a logrus logger
|
||||
func InitLogger(logger *log.Logger, logLevel string, logs ...string) error {
|
||||
level, err := log.ParseLevel(logLevel)
|
||||
if err != nil {
|
||||
log.Errorf("Failed parsing log-level %s: %s", logLevel, err)
|
||||
logger.Errorf("Failed parsing log-level %s: %s", logLevel, err)
|
||||
return err
|
||||
}
|
||||
var writers []io.Writer
|
||||
@@ -41,34 +46,34 @@ func InitLog(logLevel string, logs ...string) error {
|
||||
for _, logPath := range logs {
|
||||
switch logPath {
|
||||
case LogSyslog:
|
||||
AddSyslogHook()
|
||||
AddSyslogHookToLogger(logger)
|
||||
logFmt = "syslog"
|
||||
case LogConsole:
|
||||
writers = append(writers, os.Stderr)
|
||||
case "":
|
||||
log.Warnf("empty log path received: %#v", logPath)
|
||||
logger.Warnf("empty log path received: %#v", logPath)
|
||||
default:
|
||||
writers = append(writers, newRotatedOutput(logPath))
|
||||
}
|
||||
}
|
||||
|
||||
if len(writers) > 1 {
|
||||
log.SetOutput(io.MultiWriter(writers...))
|
||||
logger.SetOutput(io.MultiWriter(writers...))
|
||||
} else if len(writers) == 1 {
|
||||
log.SetOutput(writers[0])
|
||||
logger.SetOutput(writers[0])
|
||||
}
|
||||
|
||||
switch logFmt {
|
||||
case "json":
|
||||
formatter.SetJSONFormatter(log.StandardLogger())
|
||||
formatter.SetJSONFormatter(logger)
|
||||
case "syslog":
|
||||
formatter.SetSyslogFormatter(log.StandardLogger())
|
||||
formatter.SetSyslogFormatter(logger)
|
||||
default:
|
||||
formatter.SetTextFormatter(log.StandardLogger())
|
||||
formatter.SetTextFormatter(logger)
|
||||
}
|
||||
log.SetLevel(level)
|
||||
logger.SetLevel(level)
|
||||
|
||||
setGRPCLibLogger()
|
||||
setGRPCLibLogger(logger)
|
||||
|
||||
return nil
|
||||
}
|
||||
@@ -96,8 +101,8 @@ func newRotatedOutput(logPath string) io.Writer {
|
||||
return lumberjackLogger
|
||||
}
|
||||
|
||||
func setGRPCLibLogger() {
|
||||
logOut := log.StandardLogger().Writer()
|
||||
func setGRPCLibLogger(logger *log.Logger) {
|
||||
logOut := logger.Writer()
|
||||
if os.Getenv("GRPC_GO_LOG_SEVERITY_LEVEL") != "info" {
|
||||
grpclog.SetLoggerV2(grpclog.NewLoggerV2(io.Discard, logOut, logOut))
|
||||
return
|
||||
|
||||
@@ -10,10 +10,14 @@ import (
|
||||
)
|
||||
|
||||
func AddSyslogHook() {
|
||||
AddSyslogHookToLogger(log.StandardLogger())
|
||||
}
|
||||
|
||||
func AddSyslogHookToLogger(logger *log.Logger) {
|
||||
hook, err := lSyslog.NewSyslogHook("", "", syslog.LOG_INFO, "")
|
||||
|
||||
if err != nil {
|
||||
log.Errorf("Failed creating syslog hook: %s", err)
|
||||
logger.Errorf("Failed creating syslog hook: %s", err)
|
||||
}
|
||||
log.AddHook(hook)
|
||||
logger.AddHook(hook)
|
||||
}
|
||||
|
||||
@@ -1,6 +1,13 @@
|
||||
package util
|
||||
|
||||
import log "github.com/sirupsen/logrus"
|
||||
|
||||
func AddSyslogHook() {
|
||||
// The syslog package is not available for Windows. This adapter is needed
|
||||
// to handle windows build.
|
||||
}
|
||||
|
||||
func AddSyslogHookToLogger(logger *log.Logger) {
|
||||
// The syslog package is not available for Windows. This adapter is needed
|
||||
// to handle windows build.
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user