modified: kiteq.go

modified: server/kite_store_parser.go modified: store/mysql/kite_mysql.go
songshubing · Mar 27, 2015 · 4f6421f · 4f6421f
1 parent 78b7bfc
commit 4f6421f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/kiteq.go b/kiteq.go
@@ -25,7 +25,7 @@ func main() {
 	zkhost := flag.String("zkhost", "localhost:2181", "-zkhost=localhost:2181")
 	topics := flag.String("topics", "", "-topics=trade,a,b")
 	db := flag.String("db", "mmap://file=/data/kiteq&initcap=100000&maxcap=200000",
-		"-db=mysql://master:3306,slave:3306/kite?username=root&password=root&maxConn=500&batchUpdateSize=1000&batchDelSize=1000&flushPeriod=1000")
+		"-db=mysql://master:3306,slave:3306?db=kite&username=root&password=root&maxConn=500&batchUpdateSize=1000&batchDelSize=1000&flushPeriod=1000")
 	pprofPort := flag.Int("pport", -1, "pprof port default value is -1 ")
 
 	flag.Parse()

diff --git a/server/kite_store_parser.go b/server/kite_store_parser.go
@@ -118,6 +118,7 @@ func parseDB(db string) store.IKiteStore {
 		options := smq.MysqlOptions{
 			Addr:         master,
 			SlaveAddr:    slave,
+			DB:           params["db"],
 			Username:     username,
 			Password:     password,
 			BatchUpSize:  bus,

diff --git a/store/mysql/kite_mysql.go b/store/mysql/kite_mysql.go
@@ -13,6 +13,7 @@ import (
 type MysqlOptions struct {
 	Addr                      string
 	SlaveAddr                 string
+	DB                        string
 	Username, Password        string
 	BatchUpSize, BatchDelSize int
 	FlushPeriod               time.Duration
@@ -35,12 +36,12 @@ type KiteMysqlStore struct {
 func NewKiteMysql(options MysqlOptions) *KiteMysqlStore {
 
 	master := openDb(
-		options.Username+":"+options.Password+"@tcp("+options.Addr+")",
+		options.Username+":"+options.Password+"@tcp("+options.Addr+")/"+options.DB,
 		options.MaxIdleConn, options.MaxOpenConn)
 	slave := master
 	if len(options.SlaveAddr) > 0 {
 		slave = openDb(
-			options.Username+":"+options.Password+"@tcp("+options.SlaveAddr+")",
+			options.Username+":"+options.Password+"@tcp("+options.SlaveAddr+")/"+options.DB,
 			options.MaxIdleConn, options.MaxOpenConn)
 	}