move db init/open functions into a single file

ergonomadic.go

@@ -2,12 +2,10 @@ package main
 
 import (
 	"code.google.com/p/go.crypto/bcrypt"
-	"database/sql"
 	"encoding/base64"
 	"flag"
 	"fmt"
 	"github.com/jlatt/ergonomadic/irc"
-	_ "github.com/mattn/go-sqlite3"
 	"log"
 	"os"
 )
@@ -21,27 +19,6 @@ func genPasswd(passwd string) {
 	fmt.Println(encoded)
 }
 
-func initDB(config *irc.Config) {
-	os.Remove(config.Database())
-
-	db, err := sql.Open("sqlite3", config.Database())
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer db.Close()
-
-	_, err = db.Exec(`
-        CREATE TABLE channel (
-          name TEXT NOT NULL UNIQUE,
-          flags TEXT NOT NULL,
-          key TEXT NOT NULL,
-          topic TEXT NOT NULL,
-          user_limit INTEGER DEFAULT 0)`)
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-
 func main() {
 	conf := flag.String("conf", "ergonomadic.json", "ergonomadic config file")
 	initdb := flag.Bool("initdb", false, "initialize database")
@@ -59,7 +36,7 @@ func main() {
 	}
 
 	if *initdb {
-		initDB(config)
+		irc.InitDB(config.Database())
 		return
 	}
 

irc/database.go

@@ -0,0 +1,32 @@
+package irc
+
+import (
+	"database/sql"
+	_ "github.com/mattn/go-sqlite3"
+	"log"
+	"os"
+)
+
+func InitDB(path string) {
+	os.Remove(path)
+	db := OpenDB(path)
+	defer db.Close()
+	_, err := db.Exec(`
+        CREATE TABLE channel (
+          name TEXT NOT NULL UNIQUE,
+          flags TEXT NOT NULL,
+          key TEXT NOT NULL,
+          topic TEXT NOT NULL,
+          user_limit INTEGER DEFAULT 0)`)
+	if err != nil {
+		log.Fatal(err)
+	}
+}
+
+func OpenDB(path string) *sql.DB {
+	db, err := sql.Open("sqlite3", path)
+	if err != nil {
+		log.Fatal(err)
+	}
+	return db
+}

irc/server.go

@@ -7,7 +7,6 @@ import (
 	"database/sql"
 	"encoding/binary"
 	"fmt"
-	_ "github.com/mattn/go-sqlite3"
 	"log"
 	"net"
 	"os"
@@ -36,17 +35,12 @@ type Server struct {
 }
 
 func NewServer(config *Config) *Server {
-	db, err := sql.Open("sqlite3", config.Database())
-	if err != nil {
-		log.Fatal(err)
-	}
-
 	server := &Server{
 		channels:  make(ChannelNameMap),
 		clients:   make(ClientNameMap),
 		commands:  make(chan Command, 16),
 		ctime:     time.Now(),
-		db:        db,
+		db:        OpenDB(config.Database()),
 		idle:      make(chan *Client, 16),
 		motdFile:  config.MOTD,
 		name:      config.Name,