DriverConfig.Params enables generic db parameters

config/config.go

@@ -13,9 +13,7 @@ import (
 )
 
 // Duration wraps a time.Duration and adds JSON marshalling.
-type Duration struct {
+type Duration struct{ time.Duration }
-	time.Duration
-}
 
 // MarshalJSON transforms a duration into JSON.
 func (d *Duration) MarshalJSON() ([]byte, error) {
@@ -33,18 +31,8 @@ func (d *Duration) UnmarshalJSON(b []byte) error {
 // DriverConfig is the configuration used to connect to a tracker.Driver or
 // a backend.Driver.
 type DriverConfig struct {
-	Driver   string `json:"driver"`
+	Name   string            `json:"driver"`
-	Network  string `json:"network`
+	Params map[string]string `json:"params,omitempty"`
-	Host     string `json:"host"`
-	Port     string `json:"port"`
-	Username string `json:"user"`
-	Password string `json:"pass"`
-	Schema   string `json:"schema,omitempty"`
-	Encoding string `json:"encoding,omitempty"`
-	Prefix   string `json:"prefix,omitempty"`
-
-	MaxIdleConns int       `json:"max_idle_conns,omitempty"`
-	IdleTimeout  *Duration `json:"idle_timeout,omitempty"`
 }
 
 // Config is a configuration for a Server.
@@ -66,10 +54,10 @@ type Config struct {
 var DefaultConfig = Config{
 	Addr: ":6881",
 	Tracker: DriverConfig{
-		Driver: "mock",
+		Name: "mock",
 	},
 	Backend: DriverConfig{
-		Driver: "mock",
+		Name: "mock",
 	},
 	Private:         false,
 	Freeleech:       false,

drivers/backend/backend.go

@@ -19,7 +19,7 @@ var drivers = make(map[string]Driver)
 // Driver represents an interface to a long-running connection with a
 // consistent data store.
 type Driver interface {
-	New(*config.DriverConfig) Conn
+	New(*config.DriverConfig) (Conn, error)
 }
 
 // Register makes a database driver available by the provided name.
@@ -36,16 +36,15 @@ func Register(name string, driver Driver) {
 }
 
 // Open creates a connection specified by a models configuration.
-func Open(conf *config.DriverConfig) (Conn, error) {
+func Open(cfg *config.DriverConfig) (Conn, error) {
-	driver, ok := drivers[conf.Driver]
+	driver, ok := drivers[cfg.Name]
 	if !ok {
 		return nil, fmt.Errorf(
 			"backend: unknown driver %q (forgotten import?)",
-			conf.Driver,
+			cfg.Name,
 		)
 	}
-	pool := driver.New(conf)
+	return driver.New(cfg)
-	return pool, nil
 }
 
 // Conn represents a connection to the data store.

drivers/backend/mock/driver.go

@@ -24,8 +24,8 @@ type Mock struct {
 	deltaHistoryM sync.RWMutex
 }
 
-func (d *driver) New(conf *config.DriverConfig) backend.Conn {
+func (d *driver) New(conf *config.DriverConfig) (backend.Conn, error) {
-	return &Mock{}
+	return &Mock{}, nil
 }
 
 // Close returns nil.

drivers/tracker/tracker.go

@@ -47,15 +47,15 @@ func Register(name string, driver Driver) {
 }
 
 // Open creates a pool of data store connections specified by a models configuration.
-func Open(conf *config.DriverConfig) (Pool, error) {
+func Open(cfg *config.DriverConfig) (Pool, error) {
-	driver, ok := drivers[conf.Driver]
+	driver, ok := drivers[cfg.Name]
 	if !ok {
 		return nil, fmt.Errorf(
 			"unknown driver %q (forgotten import?)",
-			conf.Driver,
+			cfg.Name,
 		)
 	}
-	pool := driver.New(conf)
+	pool := driver.New(cfg)
 	return pool, nil
 }