Fix 修复SQLITE_BUSY

paoka1 · Jan 15, 2024 · e51ee27 · e51ee27
1 parent e03b5da
commit e51ee27
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/cmd/ssug/main.go b/cmd/ssug/main.go
@@ -20,7 +20,6 @@ func init() {
 func Main() {
 	p := base.ParsePara()
 	data.Redirect.Init(p.Key, p.TTL)
-	defer data.Redirect.Close()
 	base2.RemoveExp()
 	base2.SetInitLen(p.InitLen)
 

diff --git a/modules/data/data.go b/modules/data/data.go
@@ -49,10 +49,6 @@ func (r *redirect) GetKey() string {
 	return r.accessKey
 }
 
-func (r *redirect) Close() {
-	r.db.close()
-}
-
 // AddMapping 添加新的映射
 func (r *redirect) AddMapping(originalURL string, shortURL string) (Mapping, error) {
 	r.l.Lock()

diff --git a/modules/data/db.go b/modules/data/db.go
@@ -48,10 +48,6 @@ func (d *database) open() (*sql.DB, error) {
 	return db, nil
 }
 
-func (d *database) close() {
-	_ = d.db.Close()
-}
-
 // 向数据库添加短链映射
 func (d *database) addMapping(m Mapping) error {
 	insSQL := "INSERT INTO %s VALUES (?, ?, ?);"
@@ -122,9 +118,13 @@ func (d *database) hasOriginalURL(originalURL string) bool {
 	if rows.Err() != nil {
 		return false
 	}
+	defer func(rows *sql.Rows) {
+		_ = rows.Close()
+	}(rows)
 	if !rows.Next() {
 		return false
 	}
+	_ = rows.Close()
 	return true
 }
 
@@ -145,9 +145,13 @@ func (d *database) hasShortURL(shortURL string) bool {
 	if rows.Err() != nil {
 		return false
 	}
+	defer func(rows *sql.Rows) {
+		_ = rows.Close()
+	}(rows)
 	if !rows.Next() {
 		return false
 	}
+	_ = rows.Close()
 	return true
 }
 
@@ -172,6 +176,9 @@ func (d *database) getRemove(time int64) ([]Mapping, error) {
 		_ = rows.Scan(&m.ShortURL, &m.OriginalURL, &m.ExpirationTime)
 		ms = append(ms, m)
 	}
+	defer func(rows *sql.Rows) {
+		_ = rows.Close()
+	}(rows)
 	return ms, nil
 }