More closes

rvilim · Sep 19, 2024 · 2ac07c2 · 2ac07c2
1 parent d0e61b1
commit 2ac07c2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 1 deletion.
diff --git a/internal/impl/sql/cache_sql.go b/internal/impl/sql/cache_sql.go
@@ -168,6 +168,7 @@ func newSQLCacheFromConfig(conf *service.ParsedConfig, mgr *service.Resources) (
 
 	go func() {
 		<-s.shutSig.HardStopChan()
+		_ = s.db.Close()
 		s.shutSig.TriggerHasStopped()
 	}()
 

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

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

diff --git a/internal/impl/sql/processor_sql_insert.go b/internal/impl/sql/processor_sql_insert.go
@@ -179,6 +179,9 @@ func NewSQLInsertProcessorFromConfig(conf *service.ParsedConfig, mgr *service.Re
 
 	go func() {
 		<-s.shutSig.HardStopChan()
+		s.dbMut.Lock()
+		_ = s.db.Close()
+		s.dbMut.Unlock()
 		s.shutSig.TriggerHasStopped()
 	}()
 

diff --git a/internal/impl/sql/processor_sql_raw.go b/internal/impl/sql/processor_sql_raw.go
@@ -174,7 +174,9 @@ func newSQLRawProcessor(
 
 	go func() {
 		<-s.shutSig.HardStopChan()
+		s.dbMut.Lock()
 		_ = s.db.Close()
+		s.dbMut.Unlock()
 
 		s.shutSig.TriggerHasStopped()
 	}()

diff --git a/internal/impl/sql/processor_sql_select.go b/internal/impl/sql/processor_sql_select.go
@@ -178,6 +178,10 @@ func NewSQLSelectProcessorFromConfig(conf *service.ParsedConfig, mgr *service.Re
 
 	go func() {
 		<-s.shutSig.HardStopChan()
+		s.dbMut.Lock()
+		_ = s.db.Close()
+		s.dbMut.Unlock()
+
 		s.shutSig.TriggerHasStopped()
 	}()