diff options
| author | Markus Grüneis <gimpf@gimpf.org> | 2014-10-25 00:38:26 +0200 |
|---|---|---|
| committer | Markus Grüneis <gimpf@gimpf.org> | 2014-10-25 00:38:35 +0200 |
| commit | 5490f7ca76b1dd5a4f11fe2dbe2b6cd6a8a69d9e (patch) | |
| tree | 86412c08076835b0c1e24386961a0ceb69d90066 | |
| parent | fixed jquery path (diff) | |
hub: fix embarassing build errors
| -rw-r--r-- | src/hub/src/spreadspace.org/sfive-hub/s5hub.go | 2 | ||||
| -rw-r--r-- | src/hub/src/spreadspace.org/sfive/s5store.go | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/hub/src/spreadspace.org/sfive-hub/s5hub.go b/src/hub/src/spreadspace.org/sfive-hub/s5hub.go index 4b45b15..4541b2e 100644 --- a/src/hub/src/spreadspace.org/sfive-hub/s5hub.go +++ b/src/hub/src/spreadspace.org/sfive-hub/s5hub.go @@ -13,7 +13,7 @@ var s5hl = log.New(os.Stderr, "[s5hub]\t", log.LstdFlags) func main() { db := flag.String("db", "/var/lib/sfive/db.sqlite", "path to the sqlite3 database file") - dbMysql = flag.Bool("db-mysql", false, "use MySQL connector") + dbMysql := flag.Bool("db-mysql", false, "use MySQL connector") pipe := flag.String("pipe", "/var/run/sfive/pipe", "path to the unix pipe for the pipeserver") ppipe := flag.String("pipegram", "/var/run/sfive/pipegram", "path to the unix datagram pipe for the pipeserver") startPipe := flag.Bool("start-pipe-server", true, "start a connection oriented pipe server; see option pipe") diff --git a/src/hub/src/spreadspace.org/sfive/s5store.go b/src/hub/src/spreadspace.org/sfive/s5store.go index 5fbd7f7..f96ef9f 100644 --- a/src/hub/src/spreadspace.org/sfive/s5store.go +++ b/src/hub/src/spreadspace.org/sfive/s5store.go @@ -70,8 +70,7 @@ func updateFromStatisticsData(value StatisticsData) (dataUpdateDb, []clientDataD func initDb(mysql bool, path string) (res *gorp.DbMap, hubId string, err error) { // connect to db using standard Go database/sql API - var db *DB - var err error + var db *sql.DB var dialect gorp.Dialect if mysql { @@ -79,7 +78,7 @@ func initDb(mysql bool, path string) (res *gorp.DbMap, hubId string, err error) if err != nil { return } - dialect = gorp.MySqlDialect{} + dialect = gorp.MySQLDialect{} } else { db, err = sql.Open("sqlite3", path) if err != nil { |