From 5c4d1da8b766cc200f3aafb316642a0081bdc70e Mon Sep 17 00:00:00 2001
From: ayame-git <s.varezhkin.601@gmail.com>
Date: Sat, 6 May 2017 21:27:26 +0300
Subject: [PATCH] fixed for good now

---
 db/gorm.go |   7 +++----
 dbdb       | Bin 0 -> 20480 bytes
 main.go    |  13 +++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 dbdb

diff --git a/db/gorm.go b/db/gorm.go
index 42ba2bf9..693352e2 100644
--- a/db/gorm.go
+++ b/db/gorm.go
@@ -2,18 +2,17 @@ package db
 
 import (
 	"github.com/ewhal/nyaa/config"
-	"github.com/ewhal/nyaa/util/log"
 	"github.com/ewhal/nyaa/model"
+	"github.com/ewhal/nyaa/util/log"
 	"github.com/jinzhu/gorm"
 	_ "github.com/jinzhu/gorm/dialects/sqlite"
 	// _ "github.com/go-sql-driver/mysql"
 )
 
-var ORM, Errs = GormInit()
+var ORM *gorm.DB
 
 // GormInit init gorm ORM.
-func GormInit() (*gorm.DB, error) {
-	conf := config.NewConfig()
+func GormInit(conf *config.Config) (*gorm.DB, error) {
 	db, err := gorm.Open(conf.DBType, conf.DBParams)
 	// db, err := gorm.Open("mysql", config.MysqlDSL())
 	//db, err := gorm.Open("sqlite3", "/tmp/gorm.db")
diff --git a/dbdb b/dbdb
new file mode 100644
index 0000000000000000000000000000000000000000..691e845934c3ed2d4b38d34703d081670d3980e5
GIT binary patch
literal 20480
zcmeI#O;5rw7{KvOXNU)kH@pz*5)&2|4;t^jgc}!M?xetgM%c(!HG0GN?fe3M96MmL
z4fO*o|0d1)vh8{LYcIXO?I<0HVH8iL7U$N!W!u)J5SC>*rtX-Um9(GMtk_xOpQmG;
z?zZaY1*hJ(_P+Lp^-t5FAb<b@2q1s}0tg_000Pw%7&^5^vuV!{wd_rTL`(gY1WESX
zxw&g!J+#Hc)pe&W+-%qttyR0L2Ch({4n{%jXJet92CjIPaepl1*4f2{C%pN=cCF!g
z_WW@f=&9H3OY>P2D-*8Jb4o!AlZ(*nk=IfJ`I*f$e0L_}Ak_Jfgg4u&HI9z#`N<-)
zbyn-vb}^&%M4HX2SIXpPbTbR#y&u~P^^fKvq>kb=t0a4F6~kr2X|Pp0zX1Pda5I$u
zM|L^zQr^og{{8=BnT(73>bnE8iLU6WkvRmW7rlg&NDh+Rp%^N2uGCxUM3{Gjq#vu9
zR#9kvFo}95*=RaVA(nmNrFV04>8Buo00IagfB*srAb<b@2q1t!g$20(S9o(-8UhF)
zfB*srAb<b@2q1s}0xJRT{~QGb5I_I{1Q0*~0R#|0009K5FTnl3`g_a@5kLR|1Q0*~
N0R#|0009IL_y#hE?UMii

literal 0
HcmV?d00001

diff --git a/main.go b/main.go
index 6767a816..b49a6389 100755
--- a/main.go
+++ b/main.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 
 	"github.com/ewhal/nyaa/config"
+	"github.com/ewhal/nyaa/db"
 	"github.com/ewhal/nyaa/router"
 	"github.com/ewhal/nyaa/util/log"
 
@@ -30,20 +31,20 @@ func RunServer(conf *config.Config) {
 
 func main() {
 	conf := config.NewConfig()
-	conf_bind := conf.BindFlags()
+	process_flags := conf.BindFlags()
 	defaults := flag.Bool("print-defaults", false, "print the default configuration file on stdout")
 	flag.Parse()
-	err := conf_bind()
-	if err != nil {
-		log.CheckError(err)
-	}
 	if *defaults {
 		stdout := bufio.NewWriter(os.Stdout)
 		conf.Pretty(stdout)
 		stdout.Flush()
 		os.Exit(0)
 	} else {
-		conf_bind()
+		err := process_flags()
+		if err != nil {
+			log.CheckError(err)
+		}
+		db.ORM, _ = db.GormInit(conf)
 		RunServer(conf)
 	}
 }