chore(pkg/server): pgsql server creation only when enabled

Signed-off-by: Jeronimo Irazabal <[email protected]>
codenotary · Oct 28, 2023 · 5244d10 · 5244d10
1 parent 3456bb5
commit 5244d10
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/pkg/server/remote_storage_test.go b/pkg/server/remote_storage_test.go
@@ -500,6 +500,7 @@ func TestRemoteStorageUsedForNewDB(t *testing.T) {
 	s.WithOptions(DefaultOptions().
 		WithDir(dir).
 		WithPort(0).
+		WithPgsqlServer(false).
 		WithListener(bufconn.Listen(1024 * 1024)),
 	)
 

diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -250,15 +250,16 @@ func (s *ImmuServer) Initialize() error {
 	protomodel.RegisterAuthorizationServiceServer(s.GrpcServer, &authenticationServiceImp{server: s})
 	grpc_prometheus.Register(s.GrpcServer)
 
-	s.PgsqlSrv = pgsqlsrv.New(
-		pgsqlsrv.Host(s.Options.Address),
-		pgsqlsrv.Port(s.Options.PgsqlServerPort),
-		pgsqlsrv.ImmudbPort(s.Listener.Addr().(*net.TCPAddr).Port),
-		pgsqlsrv.TLSConfig(s.Options.TLSConfig),
-		pgsqlsrv.Logger(s.Logger),
-		pgsqlsrv.DatabaseList(s.dbList),
-	)
 	if s.Options.PgsqlServer {
+		s.PgsqlSrv = pgsqlsrv.New(
+			pgsqlsrv.Host(s.Options.Address),
+			pgsqlsrv.Port(s.Options.PgsqlServerPort),
+			pgsqlsrv.ImmudbPort(s.Listener.Addr().(*net.TCPAddr).Port),
+			pgsqlsrv.TLSConfig(s.Options.TLSConfig),
+			pgsqlsrv.Logger(s.Logger),
+			pgsqlsrv.DatabaseList(s.dbList),
+		)
+
 		if err = s.PgsqlSrv.Initialize(); err != nil {
 			return err
 		}

diff --git a/pkg/server/servertest/server.go b/pkg/server/servertest/server.go
@@ -142,8 +142,11 @@ func (bs *BufconnServer) Stop() error {
 	if err := bs.Server.Srv.CloseDatabases(); err != nil {
 		return err
 	}
-	if err := bs.Server.Srv.PgsqlSrv.Stop(); err != nil {
-		return err
+
+	if bs.Server.Srv.PgsqlSrv != nil {
+		if err := bs.Server.Srv.PgsqlSrv.Stop(); err != nil {
+			return err
+		}
 	}
 
 	if bs.GrpcServer != nil {