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

[Monitoring] Await promise properly #29001

Merged
merged 3 commits into from
Jan 29, 2019
Merged

[Monitoring] Await promise properly #29001

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2727aab
Await this promise
chrisronline Jan 18, 2019
6bfdfd7
Merge remote-tracking branch 'elastic/master' into monitoring/handle_…
chrisronline Jan 22, 2019
be5c697
Add one additional log message and a test around that
chrisronline Jan 22, 2019
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 x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export class BulkUploader {
if (payload) {
try {
this._log.debug(`Uploading bulk stats payload to the local cluster`);
this._onPayload(payload);
await this._onPayload(payload);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should be able to await this on the tests that mock Elasticsearch, then assert that it sent the payload (or failed) with itself returning until it did that while also avoiding an exception being thrown from this method.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this will work: be5c697

Thoughts?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pinging my favorite Chris @pickypg!

} catch (err) {
this._log.warn(err.stack);
this._log.warn(`Unable to bulk upload the stats payload to the local cluster`);
Expand Down