Skip to content

logging: return serialization error to callback instead of throwing #2081

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
stephenplusplus merged 1 commit into from
Mar 16, 2017
Merged

logging: return serialization error to callback instead of throwing #2081

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
14 changes: 11 additions & 3 deletions packages/logging/src/log.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,9 +630,17 @@ Log.prototype.decorateEntries_ = function(entries, callback) {
entry = self.entry(entry);
}

var decoratedEntry = entry.toJSON({
removeCircular: self.removeCircular_
});
var decoratedEntry;

try {
decoratedEntry = entry.toJSON({
removeCircular: self.removeCircular_
});
} catch(e) {
callback(e);
return;
}

decoratedEntry.logName = self.formattedName_;

self.metadata_.assignDefaultResource(decoratedEntry, function(err, entry) {
Expand Down
14 changes: 14 additions & 0 deletions packages/logging/test/log.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,6 +696,20 @@ describe('Log', function() {
log.decorateEntries_([entry], assert.ifError);
});

it('should exec callback with error from serialization', function(done) {
var error = new Error('Error.');

var entry = new Entry();
entry.toJSON = function() {
throw error;
};

log.decorateEntries_([entry], function(err) {
assert.strictEqual(err, error);
done();
});
});

it('should assign the log name', function(done) {
log.decorateEntries_([{}], function(err, decoratedEntries) {
assert.ifError(err);
Expand Down