From 3c824652020b6e970662d1d6fb9349782bda93d4 Mon Sep 17 00:00:00 2001
From: Pascal Fischer <pascal@netbird.io>
Date: Tue, 27 May 2025 09:51:28 +0200
Subject: [PATCH] hook event store

---
 internal/server/boot.go                          | 16 +++++++++++++++-
 internal/shared/activity/sqlite/sqlite.go        |  2 +-
 .../api/rest/middleware/logging_middleware.go    |  1 +
 pkg/logging/init.go                              |  8 +++++---
 4 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 internal/shared/api/rest/middleware/logging_middleware.go

diff --git a/internal/server/boot.go b/internal/server/boot.go
index afca359..de21449 100644
--- a/internal/server/boot.go
+++ b/internal/server/boot.go
@@ -4,9 +4,12 @@ package server
 
 import (
 	"context"
+	"net/http"
+
+	"management/internal/shared/activity"
+	"management/internal/shared/activity/sqlite"
 	"management/internal/shared/api/rest"
 	"management/internal/shared/db"
-	"net/http"
 )
 
 func (s *Server) Store() *db.Store {
@@ -31,3 +34,14 @@ func (s *Server) HttpServer() *http.Server {
 		}
 	})
 }
+
+func (s *Server) EventStore() activity.Store {
+	return Create(s, func() activity.Store {
+		ctx := context.Background()
+		store, err := sqlite.NewSQLiteStore(ctx, "dataDir", "encryptionKey")
+		if err != nil {
+			log.Fatalf("error while creating event store: %s", err)
+		}
+		return store
+	})
+}
diff --git a/internal/shared/activity/sqlite/sqlite.go b/internal/shared/activity/sqlite/sqlite.go
index ffb863d..9eb8df0 100644
--- a/internal/shared/activity/sqlite/sqlite.go
+++ b/internal/shared/activity/sqlite/sqlite.go
@@ -12,7 +12,7 @@ import (
 	_ "github.com/mattn/go-sqlite3"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/netbirdio/netbird/management/server/activity"
+	"management/internal/shared/activity"
 )
 
 const (
diff --git a/internal/shared/api/rest/middleware/logging_middleware.go b/internal/shared/api/rest/middleware/logging_middleware.go
new file mode 100644
index 0000000..c870d7c
--- /dev/null
+++ b/internal/shared/api/rest/middleware/logging_middleware.go
@@ -0,0 +1 @@
+package middleware
diff --git a/pkg/logging/init.go b/pkg/logging/init.go
index a0f190f..349d266 100644
--- a/pkg/logging/init.go
+++ b/pkg/logging/init.go
@@ -14,6 +14,8 @@ import (
 
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
+	"google.golang.org/grpc/grpclog"
+	"gopkg.in/natefinch/lumberjack.v2"
 )
 
 // global map of package paths to *logrus.Logger
@@ -158,7 +160,7 @@ func InitLog(logLevel string, logPath string) error {
 			MaxAge:     30, // days
 			Compress:   true,
 		}
-		log.SetOutput(io.Writer(lumberjackLogger))
+		logrus.SetOutput(io.Writer(lumberjackLogger))
 	} else if logPath == "syslog" {
 		AddSyslogHook()
 	}
@@ -198,11 +200,11 @@ func getLogMaxSize() int {
 	if sizeVar, ok := os.LookupEnv("NB_LOG_MAX_SIZE_MB"); ok {
 		size, err := strconv.ParseInt(sizeVar, 10, 64)
 		if err != nil {
-			log.Errorf("Failed parsing log-size %s: %s. Should be just an integer", sizeVar, err)
+			logrus.Errorf("Failed parsing log-size %s: %s. Should be just an integer", sizeVar, err)
 			return defaultLogSize
 		}
 
-		log.Infof("Setting log file max size to %d MB", size)
+		logrus.Infof("Setting log file max size to %d MB", size)
 
 		return int(size)
 	}