closes added back

rvilim · Sep 19, 2024 · d0e61b1 · d0e61b1
1 parent 17f44a5
commit d0e61b1
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 0 deletions.
diff --git a/internal/impl/sql/cache_sql.go b/internal/impl/sql/cache_sql.go
@@ -166,6 +166,11 @@ func newSQLCacheFromConfig(conf *service.ParsedConfig, mgr *service.Resources) (
 	}
 	connSettings.apply(context.Background(), s.db, s.logger)
 
+	go func() {
+		<-s.shutSig.HardStopChan()
+		s.shutSig.TriggerHasStopped()
+	}()
+
 	return s, nil
 }
 

diff --git a/internal/impl/sql/input_sql_raw.go b/internal/impl/sql/input_sql_raw.go
@@ -175,6 +175,10 @@ func (s *sqlRawInput) Connect(ctx context.Context) (err error) {
 			_ = s.rows.Close()
 			s.rows = nil
 		}
+		if s.db != nil {
+			_ = s.db.Close()
+			s.db = nil
+		}
 		s.dbMut.Unlock()
 
 		s.shutSig.TriggerHasStopped()

diff --git a/internal/impl/sql/input_sql_select.go b/internal/impl/sql/input_sql_select.go
@@ -231,6 +231,9 @@ func (s *sqlSelectInput) Connect(ctx context.Context) (err error) {
 			_ = s.rows.Close()
 			s.rows = nil
 		}
+		if s.db != nil {
+			_ = s.db.Close()
+		}
 		s.dbMut.Unlock()
 
 		s.shutSig.TriggerHasStopped()

diff --git a/internal/impl/sql/output_sql_insert.go b/internal/impl/sql/output_sql_insert.go
@@ -201,6 +201,8 @@ func (s *sqlInsertOutput) Connect(ctx context.Context) error {
 
 	go func() {
 		<-s.shutSig.HardStopChan()
+		_ = s.db.Close()
+
 		s.shutSig.TriggerHasStopped()
 	}()
 

diff --git a/internal/impl/sql/output_sql_raw.go b/internal/impl/sql/output_sql_raw.go
@@ -174,6 +174,8 @@ func (s *sqlRawOutput) Connect(ctx context.Context) error {
 
 	go func() {
 		<-s.shutSig.HardStopChan()
+		_ = s.db.Close()
+
 		s.shutSig.TriggerHasStopped()
 	}()
 

diff --git a/internal/impl/sql/processor_sql_raw.go b/internal/impl/sql/processor_sql_raw.go
@@ -174,6 +174,8 @@ func newSQLRawProcessor(
 
 	go func() {
 		<-s.shutSig.HardStopChan()
+		_ = s.db.Close()
+
 		s.shutSig.TriggerHasStopped()
 	}()
 	return s, nil