From a38f778312b392614ec0ccf14f9f2790671b63eb Mon Sep 17 00:00:00 2001
From: Thibaut Horel <thibaut.horel@gmail.com>
Date: Mon, 12 Jun 2017 23:52:26 -0400
Subject: Abstract all DB access via DataStore, fix lfm_password bug

---
 main.go | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'main.go')

diff --git a/main.go b/main.go
index c4e5cd9..6080b69 100644
--- a/main.go
+++ b/main.go
@@ -19,7 +19,6 @@ type handler func(DataStore, http.ResponseWriter, *http.Request)
 
 type App struct {
 	DataStore
-	DB            *sql.DB
 	Config        *Config
 	CookieHandler *securecookie.SecureCookie
 	Template      *template.Template
@@ -33,7 +32,6 @@ func New() *App {
 	if err = db.Ping(); err != nil {
 		log.Fatal(err)
 	}
-	app.DB = db
 	app.DataStore = &SqlStore{db}
 	hashKey, err := hex.DecodeString(config.HashKey)
 	blockKey, err := hex.DecodeString(config.BlockKey)
@@ -85,7 +83,6 @@ func (app *App) InitWebServer() *http.Server {
 func main() {
 	log.SetFlags(log.LstdFlags | log.Lshortfile)
 	app := New()
-	defer app.DB.Close()
 
 	apiServer := app.InitApiServer()
 	webServer := app.InitWebServer()
-- 
cgit v1.2.3-70-g09d2