github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-08-11 13:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove config dependency from basenine init (#846)

Browse Source 
* Remove config dependency from basenine init
This commit is contained in:
Igor Gov 2022-02-23 10:06:19 +02:00 committed by GitHub
parent 97cce32e3f
commit 371e513249
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/main.go
View File

@ -140,7 +140,7 @@ func runInApiServerMode(namespace string) *gin.Engine {
if err := config.LoadConfig(); err != nil { if err := config.LoadConfig(); err != nil {
logger.Log.Fatalf("Error loading config file %v", err) logger.Log.Fatalf("Error loading config file %v", err)
} }
app.ConfigureBasenineServer(shared.BasenineHost, shared.BaseninePort) app.ConfigureBasenineServer(shared.BasenineHost, shared.BaseninePort, config.Config.MaxDBSizeBytes, config.Config.LogLevel)
startTime = time.Now().UnixNano() / int64(time.Millisecond) startTime = time.Now().UnixNano() / int64(time.Millisecond)
api.StartResolving(namespace) api.StartResolving(namespace)

12
agent/pkg/app/main.go
View File

@ -9,7 +9,6 @@ import (
"github.com/op/go-logging" "github.com/op/go-logging"
basenine "github.com/up9inc/basenine/client/go" basenine "github.com/up9inc/basenine/client/go"
"github.com/up9inc/mizu/agent/pkg/api" "github.com/up9inc/mizu/agent/pkg/api"
"github.com/up9inc/mizu/agent/pkg/config"
"github.com/up9inc/mizu/agent/pkg/controllers" "github.com/up9inc/mizu/agent/pkg/controllers"
"github.com/up9inc/mizu/shared/logger" "github.com/up9inc/mizu/shared/logger"
tapApi "github.com/up9inc/mizu/tap/api" tapApi "github.com/up9inc/mizu/tap/api"
@ -63,20 +62,18 @@ func LoadExtensions() {
controllers.InitExtensionsMap(ExtensionsMap) controllers.InitExtensionsMap(ExtensionsMap)
} }
func ConfigureBasenineServer(host string, port string) { func ConfigureBasenineServer(host string, port string, dbSize int64, logLevel logging.Level) {
if !wait.New( if !wait.New(
wait.WithProto("tcp"), wait.WithProto("tcp"),
wait.WithWait(200*time.Millisecond), wait.WithWait(200*time.Millisecond),
wait.WithBreak(50*time.Millisecond), wait.WithBreak(50*time.Millisecond),
wait.WithDeadline(5*time.Second), wait.WithDeadline(5*time.Second),
wait.WithDebug(config.Config.LogLevel == logging.DEBUG), wait.WithDebug(logLevel == logging.DEBUG),
).Do([]string{fmt.Sprintf("%s:%s", host, port)}) { ).Do([]string{fmt.Sprintf("%s:%s", host, port)}) {
logger.Log.Panicf("Basenine is not available!") logger.Log.Panicf("Basenine is not available!")
} }
// Limit the database size to default 200MB if err := basenine.Limit(host, port, dbSize); err != nil {
err := basenine.Limit(host, port, config.Config.MaxDBSizeBytes)
if err != nil {
logger.Log.Panicf("Error while limiting database size: %v", err) logger.Log.Panicf("Error while limiting database size: %v", err)
} }
@ -84,8 +81,7 @@ func ConfigureBasenineServer(host string, port string) {
for _, extension := range Extensions { for _, extension := range Extensions {
macros := extension.Dissector.Macros() macros := extension.Dissector.Macros()
for macro, expanded := range macros { for macro, expanded := range macros {
err = basenine.Macro(host, port, macro, expanded) if err := basenine.Macro(host, port, macro, expanded); err != nil {
if err != nil {
logger.Log.Panicf("Error while adding a macro: %v", err) logger.Log.Panicf("Error while adding a macro: %v", err)
} }
} }