Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 13 additions & 14 deletions al_aws_collector.js
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ class AlAwsCollector {
}


done(error, streamType, sendStatus = true) {
done(error, streamType, sendStatus = true, callback) {
let context = this._invokeContext;
if (error) {
const errorString = this.stringifyError(error);
Expand All @@ -193,13 +193,13 @@ class AlAwsCollector {
const status = this.setCollectorStatus(stream, errorString);
if (sendStatus) {
this.sendCollectorStatus(stream, status, () => {
context.fail(errorString);
callback(new Error(errorString));
});
} else {
context.fail(errorString);
callback(new Error(errorString));
}
} else {
return context.succeed();
return callback(null);
}
}

Expand Down Expand Up @@ -328,7 +328,7 @@ class AlAwsCollector {
callback);
}

handleCheckin() {
handleCheckin(callback) {
var collector = this;
async.waterfall([
function (asyncCallback) {
Expand All @@ -349,7 +349,7 @@ class AlAwsCollector {
return collector.checkin(asyncCallback);
}
], function (err) {
return collector.done(err);
return collector.done(err, null, false, callback);
});
}

Expand Down Expand Up @@ -728,10 +728,10 @@ class AlAwsCollector {

}

handleUpdate() {
handleUpdate(callback) {
var collector = this;
collector.update(function(err) {
return collector.done(err);
return collector.done(err, null, false, callback);
});
}

Expand Down Expand Up @@ -797,29 +797,28 @@ class AlAwsCollector {
});
}

handleEvent(event) {
handleEvent(event, callback) {
let collector = this;
let context = this._invokeContext;
let parsedEvent = collector._parseEvent(event);

switch (parsedEvent.RequestType) {
case 'ScheduledEvent':
switch (parsedEvent.Type) {
case 'SelfUpdate':
return collector.handleUpdate();
return collector.handleUpdate(callback);
break;
case 'Checkin':
return collector.handleCheckin();
return collector.handleCheckin(callback);
break;
default:
return context.fail('AWSC0009 Unknown scheduled event detail type: ' + parsedEvent.Type);
return callback(`AWSC0009 Unknown scheduled event detail type: ${parsedEvent.Type}`);
}
case 'Create':
return collector.registerSync(event, {});
case 'Delete':
return collector.deregisterSync(event, {});
default:
return context.fail('AWSC0012 Unknown event:' + JSON.stringify(event));
callback(`AWSC0012 Unknown event: ${JSON.stringify(event)}`);
}
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@alertlogic/al-aws-collector-js",
"version": "4.1.29",
"version": "4.2.0",
"license": "MIT",
"description": "Alert Logic AWS Collector Common Library",
"repository": {
Expand Down