Skip to content

client: fix client.GetClients() for multiple clients #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aeneasr merged 1 commit into from
Jul 21, 2016
Merged

client: fix client.GetClients() for multiple clients #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion client/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ type Storage interface {

DeleteClient(id string) error

GetClients() (map[string]*Client, error)
GetClients() (map[string]Client, error)
}
4 changes: 2 additions & 2 deletions client/manager_http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ func (m *HTTPManager) DeleteClient(id string) error {
return r.Delete()
}

func (m *HTTPManager) GetClients() (map[string]*Client, error) {
cs := make(map[string]*Client)
func (m *HTTPManager) GetClients() (map[string]Client, error) {
cs := make(map[string]Client)
var r = pkg.NewSuperAgent(m.Endpoint.String())
r.Client = m.Client
r.Dry = m.Dry
Expand Down
6 changes: 3 additions & 3 deletions client/manager_memory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ func (m *MemoryManager) DeleteClient(id string) error {
return nil
}

func (m *MemoryManager) GetClients() (clients map[string]*Client, err error) {
func (m *MemoryManager) GetClients() (clients map[string]Client, err error) {
m.Lock()
defer m.Unlock()
clients = make(map[string]*Client)
clients = make(map[string]Client)
for _, c := range m.Clients {
clients[c.ID] = &c
clients[c.ID] = c
}

return clients, nil
Expand Down
6 changes: 3 additions & 3 deletions client/manager_rethinkdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ func (m *RethinkManager) DeleteClient(id string) error {
return nil
}

func (m *RethinkManager) GetClients() (clients map[string]*Client, err error) {
func (m *RethinkManager) GetClients() (clients map[string]Client, err error) {
m.Lock()
defer m.Unlock()
clients = make(map[string]*Client)
clients = make(map[string]Client)
for _, c := range m.Clients {
clients[c.ID] = &c
clients[c.ID] = c
}

return clients, nil
Expand Down