Skip to content

Commit b35eeab

Browse files
niemyjskiniemyjski
committed
Fixed linting issues
1 parent fd9c40d commit b35eeab

12 files changed

+52
-51
lines changed

‎src/ExceptionlessClient.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,12 @@ export class ExceptionlessClient {
138138
* @param callback
139139
*/
140140
public submitEvent(event: IEvent, pluginContextData?: ContextData, callback?: (context: EventPluginContext) => void): void {
141-
function cancelled(context: EventPluginContext) {
142-
if (!!context) {
143-
context.cancelled = true;
141+
function cancelled(eventPluginContext: EventPluginContext) {
142+
if (!!eventPluginContext) {
143+
eventPluginContext.cancelled = true;
144144
}
145145

146-
return !!callback && callback(context);
146+
return !!callback && callback(eventPluginContext);
147147
}
148148

149149
const context = new EventPluginContext(this, event, pluginContextData);

‎src/plugins/default/DuplicateCheckerPlugin.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ export class DuplicateCheckerPlugin implements IEventPlugin {
2424
}
2525

2626
public run(context: EventPluginContext, next?: () => void): void {
27-
function getHashCode(error: IInnerError): number {
28-
let hashCode = 0;
29-
while (error) {
30-
if (error.message && error.message.length) {
31-
hashCode += (hashCode * 397) ^ Utils.getHashCode(error.message);
27+
function getHashCode(e: IInnerError): number {
28+
let hash = 0;
29+
while (e) {
30+
if (e.message && e.message.length) {
31+
hash += (hash * 397) ^ Utils.getHashCode(e.message);
3232
}
33-
if (error.stack_trace && error.stack_trace.length) {
34-
hashCode += (hashCode * 397) ^ Utils.getHashCode(JSON.stringify(error.stack_trace));
33+
if (e.stack_trace && e.stack_trace.length) {
34+
hash += (hash * 397) ^ Utils.getHashCode(JSON.stringify(e.stack_trace));
3535
}
36-
error = error.inner;
36+
e = e.inner;
3737
}
3838

39-
return hashCode;
39+
return hash;
4040
}
4141

4242
const error = context.event.data['@error'];

‎src/plugins/default/EventExclusionPlugin-spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ describe('EventExclusionPlugin', () => {
7272
});
7373

7474
describe('should exclude source type', () => {
75-
function run(type: string, source: string, settingKey: string, settingValue: string|boolean): boolean {
75+
function run(type: string, source: string, settingKey: string, settingValue: string | boolean): boolean {
7676
const client = new ExceptionlessClient('LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw', 'http://localhost:50000');
7777
if (settingKey) {
7878
client.config.settings[settingKey] = settingValue;

‎src/plugins/default/EventExclusionPlugin.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,28 +35,28 @@ export class EventExclusionPlugin implements IEventPlugin {
3535
}
3636
}
3737

38-
function getMinLogLevel(settings: object, loggerName: string = '*'): number {
39-
return getLogLevel(getTypeAndSourceSetting(settings, 'log', loggerName, 'Trace') + '');
38+
function getMinLogLevel(configSettings: object, loggerName: string = '*'): number {
39+
return getLogLevel(getTypeAndSourceSetting(configSettings, 'log', loggerName, 'Trace') + '');
4040
}
4141

4242
// tslint:disable-next-line:ban-types
43-
function getTypeAndSourceSetting(settings: Object = {}, type: string, source: string, defaultValue?: string|boolean): string|boolean {
43+
function getTypeAndSourceSetting(configSettings: Object = {}, type: string, source: string, defaultValue?: string | boolean): string | boolean {
4444
if (!type) {
4545
return defaultValue;
4646
}
4747

4848
const isLog = type === 'log';
4949
const sourcePrefix = `@@${type}:`;
5050

51-
const value = settings[sourcePrefix + source];
51+
const value = configSettings[sourcePrefix + source];
5252
if (value) {
5353
return !isLog ? Utils.toBoolean(value) : value;
5454
}
5555

5656
// check for wildcard match
57-
for (const key in settings) {
57+
for (const key in configSettings) {
5858
if (Utils.startsWith(key.toLowerCase(), sourcePrefix.toLowerCase()) && Utils.isMatch(source, [key.substring(sourcePrefix.length)])) {
59-
return !isLog ? Utils.toBoolean(settings[key]) : settings[key];
59+
return !isLog ? Utils.toBoolean(configSettings[key]) : configSettings[key];
6060
}
6161
}
6262

‎src/plugins/default/EventPluginTestFixture.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export function createFixture() {
1515
parse: (c: EventPluginContext, exception: Error) => ({
1616
type: exception.name,
1717
message: exception.message,
18-
stack_trace: ( exception as any).testStack || null
18+
stack_trace: (exception as any).testStack || null
1919
})
2020
};
2121
client = {

‎src/queue/DefaultEventQueue-spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ describe('DefaultEventQueue', () => {
4545
config.queue.process();
4646

4747
config.queue.onEventsPosted((events: IEvent[], response: SubmissionResponse) => {
48-
expect(( config.queue as any)._suspendProcessingUntil).to.be.undefined;
48+
expect((config.queue as any)._suspendProcessingUntil).to.be.undefined;
4949

5050
expect(config.storage.queue.get().length).to.equal(0);
5151
});
@@ -67,7 +67,7 @@ describe('DefaultEventQueue', () => {
6767
expect(config.storage.queue.get().length).to.equal(1);
6868

6969
setTimeout(() => {
70-
if (!( config.queue as any)._suspendProcessingUntil) {
70+
if (!(config.queue as any)._suspendProcessingUntil) {
7171
expect(config.storage.queue.get().length).to.equal(0);
7272
} else {
7373
expect(config.storage.queue.get().length).to.equal(1);

‎src/services/NodeErrorParser.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import nodestacktrace = require('stack-trace');
77

88
export class NodeErrorParser implements IErrorParser {
99
public parse(context: EventPluginContext, exception: Error): IError {
10-
function getStackFrames(stackFrames: any[]): IStackFrame[] {
11-
const frames: IStackFrame[] = [];
10+
function getStackFrames(frames: any[]): IStackFrame[] {
11+
const result: IStackFrame[] = [];
1212

13-
for (const frame of stackFrames) {
14-
frames.push({
13+
for (const frame of frames) {
14+
result.push({
1515
name: frame.getMethodName() || frame.getFunctionName(),
1616
// parameters: frame.args,
1717
file_name: frame.getFileName(),
@@ -24,7 +24,7 @@ export class NodeErrorParser implements IErrorParser {
2424
});
2525
}
2626

27-
return frames;
27+
return result;
2828
}
2929

3030
if (!nodestacktrace) {

‎src/storage/Storage-spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ export function describeStorage(name: string,
123123
});
124124

125125
it('should get the oldest events', () => {
126-
function getDate(baseDate: Date, offset: number) {
127-
return new Date(baseDate.getTime() + (offset * 60000));
126+
function getDate(baseDate: Date, dateOffset: number) {
127+
return new Date(baseDate.getTime() + (dateOffset * 60000));
128128
}
129129

130130
const DATE: Date = new Date();

‎src/submission/DefaultSubmissionAdapter.ts‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export class DefaultSubmissionAdapter implements ISubmissionAdapter {
1414

1515
let isCompleted: boolean = false;
1616
let useSetTimeout: boolean = false;
17-
function complete(mode: string, xhr: XMLHttpRequest) {
17+
function complete(mode: string, xhrRequest: XMLHttpRequest) {
1818
function parseResponseHeaders(headerStr) {
1919
function trim(value) {
2020
return value.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
@@ -40,17 +40,17 @@ export class DefaultSubmissionAdapter implements ISubmissionAdapter {
4040

4141
isCompleted = true;
4242

43-
let message: string = xhr.statusText;
44-
const responseText: string = xhr.responseText;
45-
let status: number = xhr.status;
43+
let message: string = xhrRequest.statusText;
44+
const responseText: string = xhrRequest.responseText;
45+
let status: number = xhrRequest.status;
4646

4747
if (mode === TIMEOUT || status === 0) {
4848
message = 'Unable to connect to server.';
4949
status = 0;
5050
} else if (mode === LOADED && !status) {
5151
status = request.method === 'POST' ? 202 : 200;
5252
} else if (status < 200 || status > 299) {
53-
const responseBody: any = (xhr as any).responseBody;
53+
const responseBody: any = (xhrRequest as any).responseBody;
5454
if (!!responseBody && !!responseBody.message) {
5555
message = responseBody.message;
5656
} else if (!!responseText && responseText.indexOf('message') !== -1) {
@@ -62,31 +62,31 @@ export class DefaultSubmissionAdapter implements ISubmissionAdapter {
6262
}
6363
}
6464

65-
callback && callback(status || 500, message || '', responseText, parseResponseHeaders(xhr.getAllResponseHeaders && xhr.getAllResponseHeaders()));
65+
callback && callback(status || 500, message || '', responseText, parseResponseHeaders(xhrRequest.getAllResponseHeaders && xhrRequest.getAllResponseHeaders()));
6666
}
6767

68-
function createRequest(userAgent: string, method: string, url: string): XMLHttpRequest {
69-
let xhr: any = new XMLHttpRequest();
70-
if (WITH_CREDENTIALS in xhr) {
71-
xhr.open(method, url, true);
68+
function createRequest(userAgent: string, method: string, uri: string): XMLHttpRequest {
69+
let xmlRequest: any = new XMLHttpRequest();
70+
if (WITH_CREDENTIALS in xmlRequest) {
71+
xmlRequest.open(method, uri, true);
7272

73-
xhr.setRequestHeader('X-Exceptionless-Client', userAgent);
73+
xmlRequest.setRequestHeader('X-Exceptionless-Client', userAgent);
7474
if (method === 'POST') {
75-
xhr.setRequestHeader('Content-Type', 'application/json');
75+
xmlRequest.setRequestHeader('Content-Type', 'application/json');
7676
}
7777
} else if (typeof XDomainRequest !== 'undefined') {
7878
useSetTimeout = true;
79-
xhr = new XDomainRequest();
80-
xhr.open(method, location.protocol === 'http:' ? url.replace('https:', 'http:') : url);
79+
xmlRequest = new XDomainRequest();
80+
xmlRequest.open(method, location.protocol === 'http:' ? uri.replace('https:', 'http:') : uri);
8181
} else {
82-
xhr = null;
82+
xmlRequest = null;
8383
}
8484

85-
if (xhr) {
86-
xhr.timeout = 10000;
85+
if (xmlRequest) {
86+
xmlRequest.timeout = 10000;
8787
}
8888

89-
return xhr;
89+
return xmlRequest;
9090
}
9191

9292
const url = `${request.url}${(request.url.indexOf('?') === -1 ? '?' : '&')}access_token=${encodeURIComponent(request.apiKey)}`;

‎src/submission/NodeSubmissionAdapter.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import { ISubmissionAdapter } from './ISubmissionAdapter';
22
import { SubmissionCallback } from './SubmissionCallback';
33
import { SubmissionRequest } from './SubmissionRequest';
44

5+
import child = require('child_process');
56
import http = require('http');
67
import https = require('https');
78
import url = require('url');
8-
import child = require('child_process');
99

1010
export class NodeSubmissionAdapter implements ISubmissionAdapter {
1111
public sendRequest(request: SubmissionRequest, callback?: SubmissionCallback, isAppExiting?: boolean) {
@@ -51,7 +51,7 @@ export class NodeSubmissionAdapter implements ISubmissionAdapter {
5151
if (response.statusCode === 0) {
5252
message = 'Unable to connect to server.';
5353
} else if (response.statusCode < 200 || response.statusCode > 299) {
54-
message = response.statusMessage || ( response as any).message;
54+
message = response.statusMessage || (response as any).message;
5555
}
5656

5757
callback && callback(response.statusCode || 500, message, responseBody, responseHeaders);

0 commit comments

Comments
 (0)