More logging

This commit is contained in:
Mr. Stallion 2020-06-30 11:46:38 -05:00
parent 168d659785
commit 8c7be4a443
5 changed files with 27 additions and 9 deletions

View File

@ -30,7 +30,7 @@ export default class Socket implements WebSocketConnection {
this.socket.addEventListener('open', handler);
}
onClose(handler: () => void): void {
onClose(handler: (e: CloseEvent) => void): void {
this.socket.addEventListener('close', handler);
}
@ -41,4 +41,4 @@ export default class Socket implements WebSocketConnection {
send(message: string): void {
this.socket.send(message);
}
}
}

View File

@ -296,10 +296,12 @@ function showPatchNotes(): void {
function onReady(): void {
log.transports.file.level = 'debug';
log.transports.console.level = 'debug';
const logLevel = (process.env.NODE_ENV === 'production') ? 'info' : 'silly';
log.transports.file.level = logLevel;
log.transports.console.level = logLevel;
log.transports.file.maxSize = 5 * 1024 * 1024;
log.transports.file.file = path.join(baseDir, 'log.txt');
log.info('Starting application.');
app.setAppUserModelId('com.squirrel.fchat.F-Chat');

View File

@ -1,11 +1,20 @@
import * as qs from 'querystring';
import log from 'electron-log'; //tslint:disable-line:match-default-export-name
import {GeneralSettings} from './common';
import Window from './Window.vue';
const logLevel = (process.env.NODE_ENV === 'production') ? 'info' : 'silly';
log.transports.file.level = logLevel;
log.transports.console.level = logLevel;
log.transports.file.maxSize = 5 * 1024 * 1024;
const params = <{[key: string]: string | undefined}>qs.parse(window.location.search.substr(1));
const settings = <GeneralSettings>JSON.parse(params['settings']!);
//tslint:disable-next-line:no-unused-expression
new Window({
el: '#app',
data: {settings}
});
});

View File

@ -94,7 +94,14 @@ export default class Connection implements Interfaces.Connection {
const data = msg.length > 6 ? <object>JSON.parse(msg.substr(4)) : undefined;
return this.handleMessage(type, data);
});
this.socket.onClose(async() => {
this.socket.onClose(async(event: CloseEvent) => {
log.debug(
'socket.onclose',
{
event
}
);
if(this.pinTimeout) clearTimeout(this.pinTimeout);
if(!this.cleanClose) this.reconnect();
this.socket = undefined;

View File

@ -245,8 +245,8 @@ export interface WebSocketConnection {
close(): void
onMessage(handler: (message: string) => Promise<void>): void
onOpen(handler: () => void): void
onClose(handler: () => void): void
onClose(handler: (e: CloseEvent) => void): void
onError(handler: (error: Error) => void): void
send(message: string): void
readyState: WebSocketConnection.ReadyState
}
}