Skip to content

Commit 0db6875

Browse files
committed
Merge pull request #22 from srijken/master
Make sure createLog works with null sourceOrMessage and null caller
2 parents 750da65 + b98549e commit 0db6875

10 files changed

+29
-20
lines changed

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "exceptionless",
3-
"version": "0.9.1",
3+
"version": "0.9.2",
44
"description": "JavaScript client for Exceptionless",
55
"license": "Apache",
66
"main": "dist/exceptionless.js",

dist/exceptionless.js

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/exceptionless.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/exceptionless.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/exceptionless.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/exceptionless.node.js

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/exceptionless.node.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "exceptionless",
3-
"version": "0.9.1",
3+
"version": "0.9.2",
44
"description": "JavaScript client for Exceptionless",
55
"license": "Apache",
66
"main": "dist/exceptionless.node.js",

src/ExceptionlessClient-spec.ts

+9
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,13 @@ describe('ExceptionlessClient', () => {
2525
done();
2626
});
2727
}, 5000);
28+
29+
it('should accept null sourceOrMessage', () => {
30+
var client = new ExceptionlessClient('LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw', 'http://localhost:50000');
31+
var builder = client.createLog(null, 'Unit Test message', 'Trace');
32+
33+
expect(builder.target.source).toBeUndefined();
34+
expect(builder.target.message).toBe('Unit Test message');
35+
expect(builder.target.data['@level']).toBe('Trace');
36+
});
2837
});

src/ExceptionlessClient.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ export class ExceptionlessClient {
5959
public createLog(sourceOrMessage:string, message?:string, level?:string): EventBuilder {
6060
var builder = this.createEvent().setType('log');
6161

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

7272
return builder;

0 commit comments

Comments
 (0)