Skip to content
This repository has been archived by the owner on Aug 9, 2022. It is now read-only.

Using more than one cluster will crash ExpVar by reusing "ClusterSql" as exported name #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Using more than one cluster will crash ExpVar by reusing "ClusterSql" as exported name #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e627f12
Added ID to NewDriver to avoid ExpVar collisions
Jul 24, 2015
da87e22
updated test
Jul 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ func (d Driver) Open(name string) (driver.Conn, error) {
}

// NewDriver returns an initialized Cluster driver, using upstreamDriver as backend
func NewDriver(upstreamDriver driver.Driver) Driver {
m := expvar.NewMap("ClusterSql")
func NewDriver(id string, upstreamDriver driver.Driver) Driver {
m := expvar.NewMap(id)
Time := new(expvar.String)
Time.Set(time.Now().String())
m.Set("FirstInstanciated", Time)
Expand Down
2 changes: 1 addition & 1 deletion cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func TestOpen(t *testing.T) {
}
}

d := NewDriver(mysql.MySQLDriver{})
d := NewDriver("ClusterSql", mysql.MySQLDriver{})

for _, ncfg := range cfg.Nodes {
if ncfg.Password != "" {
Expand Down