luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Add QueryOptions to api package's monitor

This commit is contained in:
Kyle Havlovitz 2016-11-28 16:13:49 -05:00
parent ccab51b07c
commit 475408633a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/agent.go
View File

@ -416,8 +416,9 @@ func (a *Agent) DisableNodeMaintenance() error {
// Monitor returns a channel which will receive streaming logs from the agent // Monitor returns a channel which will receive streaming logs from the agent
// Providing a non-nil stopCh can be used to close the connection and stop the // Providing a non-nil stopCh can be used to close the connection and stop the
// log stream // log stream
func (a *Agent) Monitor(loglevel string, stopCh chan struct{}) (chan string, error) { func (a *Agent) Monitor(loglevel string, stopCh chan struct{}, q *QueryOptions) (chan string, error) {
r := a.c.newRequest("GET", "/v1/agent/monitor") r := a.c.newRequest("GET", "/v1/agent/monitor")
r.setQueryOptions(q)
if loglevel != "" { if loglevel != "" {
r.params.Add("loglevel", loglevel) r.params.Add("loglevel", loglevel)
} }

2
api/agent_test.go
View File

@ -566,7 +566,7 @@ func TestAgent_Monitor(t *testing.T) {
agent := c.Agent() agent := c.Agent()
logCh, err := agent.Monitor("info", nil) logCh, err := agent.Monitor("info", nil, nil)
if err != nil { if err != nil {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }