Skip to content

Commit 448ceef

Browse files
committed
Bug fixes for the heartbeat plugin
1 parent 1e43706 commit 448ceef

13 files changed

+30
-40
lines changed

dist/exceptionless.d.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ export declare class Configuration implements IConfigurationSettings {
179179
defaultTags: string[];
180180
defaultData: Object;
181181
enabled: boolean;
182-
enableSessions: boolean;
183182
environmentInfoCollector: IEnvironmentInfoCollector;
184183
errorParser: IErrorParser;
185184
lastReferenceIdManager: ILastReferenceIdManager;

dist/exceptionless.js

Lines changed: 9 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/exceptionless.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/exceptionless.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/exceptionless.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/exceptionless.node.js

Lines changed: 8 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/exceptionless.node.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
var client = exceptionless.ExceptionlessClient.default;
1414
client.config.serverUrl = 'http://localhost:50000';
1515
client.config.useDebugLogger();
16+
client.config.setUserIdentity('12345678', 'Blake');
1617

1718
// set some default data
1819
client.config.defaultData['SampleUser'] = {

src/ExceptionlessClient.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export class ExceptionlessClient {
114114
}
115115

116116
public submitSessionHeartbeat(userIdentity?:string, userDisplayName?:string, callback?: (context: EventPluginContext) => void): void {
117-
this.createSessionEnd(userIdentity, userDisplayName).submit(callback);
117+
this.createSessionHeartbeat(userIdentity, userDisplayName).submit(callback);
118118
}
119119

120120
public createEvent(pluginContextData?: ContextData): EventBuilder {

src/configuration/Configuration.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ export class Configuration implements IConfigurationSettings {
5656
*/
5757
public enabled: boolean = true;
5858

59-
public enableSessions: boolean = true;
60-
6159
public environmentInfoCollector: IEnvironmentInfoCollector;
6260
public errorParser: IErrorParser;
6361
public lastReferenceIdManager: ILastReferenceIdManager = new DefaultLastReferenceIdManager();

src/exceptionless.node.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ const SIGINT: string = 'SIGINT';
1212
const SIGINT_CODE: number = 2;
1313

1414
let defaults = Configuration.defaults;
15-
defaults.enableSessions = false;
1615
defaults.environmentInfoCollector = new NodeEnvironmentInfoCollector();
1716
defaults.errorParser = new NodeErrorParser();
1817
defaults.moduleCollector = new NodeModuleCollector();

src/exceptionless.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ if (settings && (settings.apiKey || settings.serverUrl)) {
5151
defaults.serverUrl = settings.serverUrl;
5252
}
5353

54+
defaults.enableSessions = true;
5455
defaults.errorParser = new DefaultErrorParser();
5556
defaults.moduleCollector = new DefaultModuleCollector();
5657
defaults.requestInfoCollector = new DefaultRequestInfoCollector();

src/plugins/default/HeartbeatPlugin.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ export class HeartbeatPlugin implements IEventPlugin {
1010
private _lastUser: IUserInfo;
1111

1212
public run(context: EventPluginContext, next?: () => void): void {
13-
function clearHeartbeatInterval() {
13+
let clearHeartbeatInterval = () => {
1414
if (this._heartbeatIntervalId) {
1515
clearInterval(this._heartbeatIntervalId);
1616
this._heartbeatIntervalId = 0;
1717
}
18-
}
18+
};
1919

2020
let type = context.event.type;
2121
if (type !== 'heartbeat') {
@@ -25,16 +25,14 @@ export class HeartbeatPlugin implements IEventPlugin {
2525
let user: IUserInfo = context.event.data['@user'];
2626
if (user && user.identity) {
2727
let submitHeartbeatFn = () => context.client.submitSessionHeartbeat(user.identity, user.name);
28+
2829
if (!this._heartbeatIntervalId) {
2930
this._lastUser = user;
30-
this._heartbeatIntervalId = setInterval(submitHeartbeatFn, 30000);
3131
} else {
3232
clearHeartbeatInterval();
33-
34-
if (this._lastUser.identity !== user.identity) {
35-
this._heartbeatIntervalId = setInterval(submitHeartbeatFn, 30000);
36-
}
3733
}
34+
35+
this._heartbeatIntervalId = setInterval(submitHeartbeatFn, 30000);
3836
}
3937
}
4038
}

0 commit comments

Comments
 (0)