fix (rotator): defer rows.Close after query errors checking (#529)

sipcapture · Jul 19, 2023 · 00bd5c6 · 00bd5c6
1 parent 419aa21
commit 00bd5c6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/rotator/rotator.go b/rotator/rotator.go
@@ -336,11 +336,11 @@ func (r *Rotator) dbExecDropTables(db *sql.DB, listfile, dropfile string, d int)
 	var partName string
 
 	rows, err := db.Query(listquery)
-	defer rows.Close()
 	if err != nil {
 		logp.Err("%v", err)
 		return err
 	}
+	defer rows.Close()
 
 	for rows.Next() {
 		err := rows.Scan(&partName)
@@ -372,12 +372,14 @@ func (r *Rotator) dbExecDropTablesForFreeSpace(db *sql.DB, listfile, dropfile st
 	listquery := strings.Replace(listfile, partitionDate, partDate, -1)
 	listquery = strings.Replace(listquery, partitionTime, partTime, -1)
 	var partName string
+
 	rows, err := db.Query(listquery)
-	defer rows.Close()
 	if err != nil {
 		logp.Err("%v", err)
 		return err
 	}
+	defer rows.Close()
+
 	i := 1
 	for rows.Next() {
 		err := rows.Scan(&partName)