Merge pull request #221 from bakape/db-errors

Better DB error handling

main.go

@@ -55,7 +55,10 @@ func main() {
 		if err != nil {
 			log.CheckError(err)
 		}
-		db.ORM, _ = db.GormInit(conf)
+		db.ORM, err = db.GormInit(conf)
+		if err != nil {
+			log.Fatal(err.Error())
+		}
 		initI18N()
 		go signals.Handle()
 		if len(config.TorrentFileStorage) > 0 {

router/apiHandler.go

@@ -104,6 +104,10 @@ func ApiUploadHandler(w http.ResponseWriter, r *http.Request) {
 		Date:         time.Now(),
 		Filesize:     0,
 		Description:  string(b.Description)}
-	db.ORM.Create(&torrent)
+	err = db.ORM.Create(&torrent).Error
+	if err != nil {
+		util.SendError(w, err, 500)
+		return
+	}
 	fmt.Printf("%+v\n", torrent)
 }

router/uploadHandler.go

@@ -11,6 +11,7 @@ import (
 	"github.com/ewhal/nyaa/model"
 	"github.com/ewhal/nyaa/service/captcha"
 	"github.com/ewhal/nyaa/service/user"
+	"github.com/ewhal/nyaa/util"
 	"github.com/ewhal/nyaa/util/languages"
 	"github.com/gorilla/mux"
 )
@@ -42,7 +43,11 @@ func UploadHandler(w http.ResponseWriter, r *http.Request) {
 				Filesize:     uploadForm.Filesize, // FIXME: should set to NULL instead of 0
 				Description:  uploadForm.Description,
 				UploaderId:   user.Id}
-			db.ORM.Create(&torrent)
+			err = db.ORM.Create(&torrent).Error
+			if err != nil {
+				util.SendError(w, err, 500)
+				return
+			}
 			fmt.Printf("%+v\n", torrent)
 			url, err := Router.Get("view_torrent").URL("id", strconv.FormatUint(uint64(torrent.Id), 10))
 			if err == nil {

router/viewTorrentHandler.go

@@ -9,6 +9,7 @@ import (
 	"github.com/ewhal/nyaa/model"
 	"github.com/ewhal/nyaa/service/captcha"
 	"github.com/ewhal/nyaa/service/torrent"
+	"github.com/ewhal/nyaa/util"
 	"github.com/ewhal/nyaa/util/languages"
 	"github.com/ewhal/nyaa/util/log"
 	"github.com/gorilla/mux"
@@ -47,11 +48,15 @@ func PostCommentHandler(w http.ResponseWriter, r *http.Request) {
 	idNum_, err := strconv.Atoi(id)
 	var idNum uint = uint(idNum_)
 	var userId uint = 0
-	if (currentUser.Id > 0) {
+	if currentUser.Id > 0 {
 		userId = currentUser.Id
 	}
 	comment := model.Comment{TorrentId: idNum, UserId: userId, Content: content, CreatedAt: time.Now()}
-	db.ORM.Create(&comment)
+	err = db.ORM.Create(&comment).Error
+	if err != nil {
+		util.SendError(w, err, 500)
+		return
+	}
 
 	url, err := Router.Get("view_torrent").URL("id", id)
 	if err == nil {

service/torrent/torrent.go

@@ -23,40 +23,50 @@ type WhereParams struct {
  */
 
 // don't need raw SQL once we get MySQL
-func GetFeeds() []model.Feed {
+func GetFeeds() (result []model.Feed, err error) {
-	result := make([]model.Feed, 0, 50)
+	result = make([]model.Feed, 0, 50)
 	rows, err := db.ORM.DB().
 		Query(
 			"SELECT `torrent_id` AS `id`, `torrent_name` AS `name`, `torrent_hash` AS `hash`, `timestamp` FROM `torrents` " +
 				"ORDER BY `timestamp` desc LIMIT 50")
-	if err == nil {
+	if err != nil {
-		for rows.Next() {
+		return nil, err
-			item := model.Feed{}
-			rows.Scan(&item.Id, &item.Name, &item.Hash, &item.Timestamp)
-			magnet := util.InfoHashToMagnet(strings.TrimSpace(item.Hash), item.Name, config.Trackers...)
-			item.Magnet = magnet
-			// memory hog
-			result = append(result, item)
-		}
-		rows.Close()
 	}
-	return result
+	defer rows.Close()
+
+	for rows.Next() {
+		item := model.Feed{}
+		err = rows.Scan(&item.Id, &item.Name, &item.Hash, &item.Timestamp)
+		if err != nil {
+			return
+		}
+		magnet := util.InfoHashToMagnet(strings.TrimSpace(item.Hash), item.Name, config.Trackers...)
+		item.Magnet = magnet
+		// memory hog
+		result = append(result, item)
+	}
+	err = rows.Err()
+	return
 }
 
-func GetTorrentById(id string) (model.Torrents, error) {
+func GetTorrentById(id string) (torrent model.Torrents, err error) {
-	var torrent model.Torrents
 	id_int, err := strconv.Atoi(id)
 	if err != nil {
-		return torrent, err
+		return
 	}
 
 	tmp := db.ORM.Where("torrent_id = ?", id).Preload("Comments")
+	err = tmp.Error
+	if err != nil {
+		return
+	}
 	if id_int <= config.LastOldTorrentId {
 		// only preload old comments if they could actually exist
 		tmp = tmp.Preload("OldComments")
 	}
 	if tmp.Find(&torrent).RecordNotFound() {
-		return torrent, errors.New("Article is not found.")
+		err = errors.New("Article is not found.")
+		return
 	}
 	// GORM relly likes not doing its job correctly
 	// (or maybe I'm just retarded)
@@ -64,10 +74,13 @@ func GetTorrentById(id string) (model.Torrents, error) {
 	db.ORM.Where("user_id = ?", torrent.UploaderId).Find(torrent.Uploader)
 	for i := range torrent.Comments {
 		torrent.Comments[i].User = new(model.User)
-		db.ORM.Where("user_id = ?", torrent.Comments[i].UserId).Find(torrent.Comments[i].User)
+		err = db.ORM.Where("user_id = ?", torrent.Comments[i].UserId).Find(torrent.Comments[i].User).Error
+		if err != nil {
+			return
+		}
 	}
 
-	return torrent, nil
+	return
 }
 
 func GetTorrentsOrderByNoCount(parameters *WhereParams, orderBy string, limit int, offset int) (torrents []model.Torrents, err error) {
@@ -80,7 +93,9 @@ func GetTorrentsOrderBy(parameters *WhereParams, orderBy string, limit int, offs
 	return
 }
 
-func getTorrentsOrderBy(parameters *WhereParams, orderBy string, limit int, offset int, countAll bool) (torrents []model.Torrents, count int, err error) {
+func getTorrentsOrderBy(parameters *WhereParams, orderBy string, limit int, offset int, countAll bool) (
+	torrents []model.Torrents, count int, err error,
+) {
 	var conditionArray []string
 	if strings.HasPrefix(orderBy, "filesize") {
 		// torrents w/ NULL filesize fuck up the sorting on postgres

service/user/cookieHelper.go

@@ -4,14 +4,13 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/gorilla/securecookie"
-	"golang.org/x/crypto/bcrypt"
-	formStruct "github.com/ewhal/nyaa/service/user/form"
-
 	"github.com/ewhal/nyaa/db"
 	"github.com/ewhal/nyaa/model"
+	formStruct "github.com/ewhal/nyaa/service/user/form"
 	"github.com/ewhal/nyaa/util/log"
 	"github.com/ewhal/nyaa/util/modelHelper"
+	"github.com/gorilla/securecookie"
+	"golang.org/x/crypto/bcrypt"
 )
 
 var cookieHandler = securecookie.New(
@@ -152,6 +151,6 @@ func CurrentUser(r *http.Request) (model.User, error) {
 	if db.ORM.Where("api_token = ?", token).First(&user).RecordNotFound() {
 		return user, errors.New("User is not found.")
 	}
-	db.ORM.Model(&user)
+	err = db.ORM.Model(&user).Error
-	return user, nil
+	return user, err
 }