Skip to content
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

Jump to bottom

Add support for querying the events-log plugin #10

Merged
merged 13 commits into from
Aug 2, 2016
Merged

Add support for querying the events-log plugin #10

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0aea9fc
initial commit of EventsLogService
opalmer Jul 25, 2016
1f730e7
only strip the magic prefix if it's present
opalmer Jul 30, 2016
5d8fb6b
handle response in GetEvents() rather than passing it into events.cli…
opalmer Jul 30, 2016
13c9442
some minor cleanups to var names
opalmer Jul 30, 2016
cb50e8d
adding test for new behavior in RemoveMagicPrefixLine
opalmer Jul 30, 2016
eca621f
fix check for From/To
opalmer Jul 30, 2016
8ec2f65
fixing lint issues
opalmer Jul 30, 2016
eff38ce
fix variable name which is shadowing package
opalmer Aug 1, 2016
d6d7c7f
adding note in README about events-log support
opalmer Aug 1, 2016
b48c378
add note to the FAQ about plugin support
opalmer Aug 1, 2016
a0e5b42
url -> requestURL so we don't shadow the url package name
opalmer Aug 1, 2016
968de84
add url arguments as part of the raw query
opalmer Aug 1, 2016
0c4174c
adding tests
opalmer Aug 1, 2016
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
Prev Previous commit
Next Next commit
some minor cleanups to var names
  • Loading branch information
@opalmer
opalmer committed Jul 30, 2016
commit 13c94424bd1474d130e523c8ecbf4887bd6f4284
7 changes: 3 additions & 4 deletions events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,12 @@ type EventsLogOptions struct {
// getURL returns the url that should be used in the request. This will vary
// depending on the options provided to GetEvents.
func (events *EventsLogService) getURL(options *EventsLogOptions) (string, error) {
parsedUrl, err := url.Parse("/plugins/events-log/events/")

url, err := url.Parse("/plugins/events-log/events/")
if err != nil {
return "", err
}

query := parsedUrl.Query()
query := url.Query()

if options.From != nil {
query.Set("t1", options.From.Format("2006-01-02 15:04:05"))
Expand All @@ -94,7 +93,7 @@ func (events *EventsLogService) getURL(options *EventsLogOptions) (string, error
query.Set("t2", options.To.Format("2006-01-02 15:04:05"))
}

return parsedUrl.String(), nil
return url.String(), nil
}

// GetEvents returns a list of events for the given input options. Use of this
Expand Down