github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-09-01 10:36:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make logger a separate module such that don't depend on shared module as a whole for logging (#1047)

Browse Source 
* Make `logger` a separate module such that don't depend on `shared` module as a whole for logging

* Update `Dockerfile`
This commit is contained in:
M. Mert Yıldıran
2022-04-27 12:26:27 -07:00
committed by GitHub
parent ee8dce4466
commit e1ad302c29
96 changed files with 139 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
shared/go.mod
View File

@@ -6,6 +6,7 @@ require (
github.com/docker/go-units v0.4.0
github.com/golang-jwt/jwt/v4 v4.2.0
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
github.com/up9inc/mizu/logger v0.0.0
github.com/up9inc/mizu/tap/api v0.0.0
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
k8s.io/api v0.23.3
@@ -91,4 +92,6 @@ require (
sigs.k8s.io/yaml v1.3.0 // indirect
)
replace github.com/up9inc/mizu/logger v0.0.0 => ../logger
replace github.com/up9inc/mizu/tap/api v0.0.0 => ../tap/api

2
shared/kubernetes/mizuTapperSyncer.go
View File

@@ -7,9 +7,9 @@ import (
"time"
"github.com/op/go-logging"
"github.com/up9inc/mizu/logger"
"github.com/up9inc/mizu/shared"
"github.com/up9inc/mizu/shared/debounce"
"github.com/up9inc/mizu/shared/logger"
"github.com/up9inc/mizu/tap/api"
core "k8s.io/api/core/v1"
)

2
shared/kubernetes/provider.go
View File

@@ -12,8 +12,8 @@ import (
"regexp"
"github.com/op/go-logging"
"github.com/up9inc/mizu/logger"
"github.com/up9inc/mizu/shared"
"github.com/up9inc/mizu/shared/logger"
"github.com/up9inc/mizu/shared/semver"
"github.com/up9inc/mizu/tap/api"
auth "k8s.io/api/authorization/v1"

2
shared/kubernetes/proxy.go
View File

@@ -16,7 +16,7 @@ import (
"k8s.io/client-go/tools/portforward"
"k8s.io/client-go/transport/spdy"
"github.com/up9inc/mizu/shared/logger"
"github.com/up9inc/mizu/logger"
"k8s.io/kubectl/pkg/proxy"
)

2
shared/kubernetes/watch.go
View File

@@ -7,8 +7,8 @@ import (
"sync"
"time"
"github.com/up9inc/mizu/logger"
"github.com/up9inc/mizu/shared/debounce"
"github.com/up9inc/mizu/shared/logger"
"k8s.io/apimachinery/pkg/watch"
)

49
shared/logger/logger.go
View File

@@ -1,49 +0,0 @@
package logger
import (
"os"
"github.com/op/go-logging"
)
var Log = logging.MustGetLogger("mizu")
var format = logging.MustStringFormatter(
`[%{time:2006-01-02T15:04:05.000-0700}] %{level:-5s} ▶ %{message} ▶ [%{pid} %{shortfile} %{shortfunc}]`,
)
func InitLogger(logPath string) {
f, err := os.OpenFile(logPath, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
if err != nil {
Log.Infof("Failed to open mizu log file: %v, err %v", logPath, err)
}
fileLog := logging.NewLogBackend(f, "", 0)
consoleLog := logging.NewLogBackend(os.Stderr, "", 0)
backend2Formatter := logging.NewBackendFormatter(fileLog, format)
backend1Leveled := logging.AddModuleLevel(consoleLog)
backend1Leveled.SetLevel(logging.INFO, "")
logging.SetBackend(backend1Leveled, backend2Formatter)
}
func InitLoggerStd(level logging.Level) {
var backends []logging.Backend
stderrBackend := logging.NewLogBackend(os.Stderr, "", 0)
stderrFormater := logging.NewBackendFormatter(stderrBackend, format)
stderrLeveled := logging.AddModuleLevel(stderrFormater)
stderrLeveled.SetLevel(logging.ERROR, "")
backends = append(backends, stderrLeveled)
if level >= logging.WARNING {
stdoutBackend := logging.NewLogBackend(os.Stdout, "", 0)
stdoutFormater := logging.NewBackendFormatter(stdoutBackend, format)
stdoutLeveled := logging.AddModuleLevel(stdoutFormater)
stdoutLeveled.SetLevel(level, "")
backends = append(backends, stdoutLeveled)
}
logging.SetBackend(backends...)
}

2
shared/models.go
View File

@@ -5,7 +5,7 @@ import (
"strings"
"github.com/op/go-logging"
"github.com/up9inc/mizu/shared/logger"
"github.com/up9inc/mizu/logger"
"gopkg.in/yaml.v3"
v1 "k8s.io/api/core/v1"