Skip to content

Make sure createLog works with null sourceOrMessage and null caller #22

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
merged 2 commits into from
Jun 5, 2015
Merged

Make sure createLog works with null sourceOrMessage and null caller #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
540fbac
Make sure createLog roks with null sourceOrMessage
srijken Jun 5, 2015
b98549e
Bump version
srijken Jun 5, 2015
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 bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "exceptionless",
"version": "0.9.1",
"version": "0.9.2",
Copy link
Member

Choose a reason for hiding this comment

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

We don't need to bump it to 0.9.2 because we haven't pushed 0.9.1 :). I can fix this tho.

"description": "JavaScript client for Exceptionless",
"license": "Apache",
"main": "dist/exceptionless.js",
Expand Down
10 changes: 5 additions & 5 deletions dist/exceptionless.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/exceptionless.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/exceptionless.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/exceptionless.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions dist/exceptionless.node.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/exceptionless.node.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "exceptionless",
"version": "0.9.1",
"version": "0.9.2",
"description": "JavaScript client for Exceptionless",
"license": "Apache",
"main": "dist/exceptionless.node.js",
Expand Down
9 changes: 9 additions & 0 deletions src/ExceptionlessClient-spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,13 @@ describe('ExceptionlessClient', () => {
done();
});
}, 5000);

it('should accept null sourceOrMessage', () => {
var client = new ExceptionlessClient('LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw', 'http://localhost:50000');
var builder = client.createLog(null, 'Unit Test message', 'Trace');

expect(builder.target.source).toBeUndefined();
expect(builder.target.message).toBe('Unit Test message');
expect(builder.target.data['@level']).toBe('Trace');
});
});
8 changes: 4 additions & 4 deletions src/ExceptionlessClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@ export class ExceptionlessClient {
public createLog(sourceOrMessage:string, message?:string, level?:string): EventBuilder {
var builder = this.createEvent().setType('log');

if (sourceOrMessage && message && level) {
if (message && level) {
builder = builder.setSource(sourceOrMessage).setMessage(message).setProperty('@level', level);
} else if (sourceOrMessage && message) {
} else if (message) {
builder = builder.setSource(sourceOrMessage).setMessage(message);
} else {
// TODO: Look into using https://www.stevefenton.co.uk/Content/Blog/Date/201304/Blog/Obtaining-A-Class-Name-At-Runtime-In-TypeScript/
var source = (<any>(arguments.callee.caller)).name;
builder = builder.setSource(source).setMessage(sourceOrMessage);
var caller = (<any>(arguments.callee.caller));
builder = builder.setSource(caller && caller.name).setMessage(sourceOrMessage);
}

return builder;
Expand Down