safely close db when cps fails
continuous-integration/drone/pr Build is failing Details

This commit is contained in:
Sarah Jamie Lewis 2022-10-25 14:05:08 -07:00
parent f2b879a9c4
commit 4324ffae03
1 changed files with 11 additions and 0 deletions

View File

@ -124,66 +124,77 @@ func NewCwtchProfileStorage(db *sql.DB, profileDirectory string) (*CwtchProfileS
insertProfileKeyValueStmt, err := db.Prepare(insertProfileKeySQLStmt) insertProfileKeyValueStmt, err := db.Prepare(insertProfileKeySQLStmt)
if err != nil { if err != nil {
db.Close()
log.Errorf("error preparing query: %v %v", insertProfileKeySQLStmt, err) log.Errorf("error preparing query: %v %v", insertProfileKeySQLStmt, err)
return nil, err return nil, err
} }
selectProfileKeyStmt, err := db.Prepare(selectProfileKeySQLStmt) selectProfileKeyStmt, err := db.Prepare(selectProfileKeySQLStmt)
if err != nil { if err != nil {
db.Close()
log.Errorf("error preparing query: %v %v", selectProfileKeySQLStmt, err) log.Errorf("error preparing query: %v %v", selectProfileKeySQLStmt, err)
return nil, err return nil, err
} }
findProfileKeyStmt, err := db.Prepare(findProfileKeySQLStmt) findProfileKeyStmt, err := db.Prepare(findProfileKeySQLStmt)
if err != nil { if err != nil {
db.Close()
log.Errorf("error preparing query: %v %v", findProfileKeySQLStmt, err) log.Errorf("error preparing query: %v %v", findProfileKeySQLStmt, err)
return nil, err return nil, err
} }
insertConversationStmt, err := db.Prepare(insertConversationSQLStmt) insertConversationStmt, err := db.Prepare(insertConversationSQLStmt)
if err != nil { if err != nil {
db.Close()
log.Errorf("error preparing query: %v %v", insertConversationSQLStmt, err) log.Errorf("error preparing query: %v %v", insertConversationSQLStmt, err)
return nil, err return nil, err
} }
fetchAllConversationsStmt, err := db.Prepare(fetchAllConversationsSQLStmt) fetchAllConversationsStmt, err := db.Prepare(fetchAllConversationsSQLStmt)
if err != nil { if err != nil {
db.Close()
log.Errorf("error preparing query: %v %v", fetchAllConversationsSQLStmt, err) log.Errorf("error preparing query: %v %v", fetchAllConversationsSQLStmt, err)
return nil, err return nil, err
} }
selectConversationStmt, err := db.Prepare(selectConversationSQLStmt) selectConversationStmt, err := db.Prepare(selectConversationSQLStmt)
if err != nil { if err != nil {
db.Close()
log.Errorf("error preparing query: %v %v", selectConversationSQLStmt, err) log.Errorf("error preparing query: %v %v", selectConversationSQLStmt, err)
return nil, err return nil, err
} }
selectConversationByHandleStmt, err := db.Prepare(selectConversationByHandleSQLStmt) selectConversationByHandleStmt, err := db.Prepare(selectConversationByHandleSQLStmt)
if err != nil { if err != nil {
db.Close()
log.Errorf("error preparing query: %v %v", selectConversationByHandleSQLStmt, err) log.Errorf("error preparing query: %v %v", selectConversationByHandleSQLStmt, err)
return nil, err return nil, err
} }
acceptConversationStmt, err := db.Prepare(acceptConversationSQLStmt) acceptConversationStmt, err := db.Prepare(acceptConversationSQLStmt)
if err != nil { if err != nil {
db.Close()
log.Errorf("error preparing query: %v %v", acceptConversationSQLStmt, err) log.Errorf("error preparing query: %v %v", acceptConversationSQLStmt, err)
return nil, err return nil, err
} }
deleteConversationStmt, err := db.Prepare(deleteConversationSQLStmt) deleteConversationStmt, err := db.Prepare(deleteConversationSQLStmt)
if err != nil { if err != nil {
db.Close()
log.Errorf("error preparing query: %v %v", deleteConversationSQLStmt, err) log.Errorf("error preparing query: %v %v", deleteConversationSQLStmt, err)
return nil, err return nil, err
} }
setConversationAttributesStmt, err := db.Prepare(setConversationAttributesSQLStmt) setConversationAttributesStmt, err := db.Prepare(setConversationAttributesSQLStmt)
if err != nil { if err != nil {
db.Close()
log.Errorf("error preparing query: %v %v", setConversationAttributesSQLStmt, err) log.Errorf("error preparing query: %v %v", setConversationAttributesSQLStmt, err)
return nil, err return nil, err
} }
setConversationACLStmt, err := db.Prepare(setConversationACLSQLStmt) setConversationACLStmt, err := db.Prepare(setConversationACLSQLStmt)
if err != nil { if err != nil {
db.Close()
log.Errorf("error preparing query: %v %v", setConversationACLSQLStmt, err) log.Errorf("error preparing query: %v %v", setConversationACLSQLStmt, err)
return nil, err return nil, err
} }