Collect server logs in bug reports

Summary: Not collecting all debug logs because there are so many, but server ones are few and usually important for context on what's connected at the time.

Reviewed By: danielbuechele

Differential Revision: D9654402

fbshipit-source-id: 5ad090838be3e06c25bd93e4d85726822bd7fc4e
This commit is contained in:
John Knox
2018-09-06 06:42:14 -07:00
committed by Facebook Github Bot
parent 42ce5d992a
commit 9cfb461a9a

View File

@@ -121,7 +121,7 @@ export default class Server extends EventEmitter {
conn.connectionStatus().subscribe({ conn.connectionStatus().subscribe({
onNext(payload) { onNext(payload) {
if (payload.kind == 'ERROR' || payload.kind == 'CLOSED') { if (payload.kind == 'ERROR' || payload.kind == 'CLOSED') {
console.debug(`Device disconnected ${client.id}`, 'connection'); console.debug(`Device disconnected ${client.id}`, 'server');
server.removeConnection(client.id); server.removeConnection(client.id);
} }
}, },
@@ -152,6 +152,7 @@ export default class Server extends EventEmitter {
); );
console.warn( console.warn(
'Physical iOS device detected. This is not currently supported by sonar.', 'Physical iOS device detected. This is not currently supported by sonar.',
'server',
); );
} }
@@ -165,7 +166,11 @@ export default class Server extends EventEmitter {
try { try {
rawData = JSON.parse(payload.data); rawData = JSON.parse(payload.data);
} catch (err) { } catch (err) {
console.error(`Invalid JSON: ${payload.data}`, 'clientMessage'); console.error(
`Invalid JSON: ${payload.data}`,
'clientMessage',
'server',
);
return; return;
} }
@@ -190,7 +195,7 @@ export default class Server extends EventEmitter {
}); });
}) })
.catch(e => { .catch(e => {
console.error(e); console.error(e, 'server');
subscriber.onError(e); subscriber.onError(e);
}); });
}); });
@@ -209,7 +214,7 @@ export default class Server extends EventEmitter {
try { try {
rawData = JSON.parse(payload.data); rawData = JSON.parse(payload.data);
} catch (err) { } catch (err) {
console.error(`Invalid JSON: ${payload.data}`, 'clientMessage'); console.error(`Invalid JSON: ${payload.data}`, 'server');
return; return;
} }
@@ -244,7 +249,7 @@ export default class Server extends EventEmitter {
invariant(query, 'expected query'); invariant(query, 'expected query');
const id = `${query.app}-${query.os}-${query.device}-${query.device_id}`; const id = `${query.app}-${query.os}-${query.device}-${query.device_id}`;
console.debug(`Device connected: ${id}`, 'connection'); console.debug(`Device connected: ${id}`, 'server');
const client = new Client(id, query, conn, this.logger); const client = new Client(id, query, conn, this.logger);
@@ -258,7 +263,7 @@ export default class Server extends EventEmitter {
`Device client initialised: ${id}. Supported plugins: ${client.plugins.join( `Device client initialised: ${id}. Supported plugins: ${client.plugins.join(
', ', ', ',
)}`, )}`,
'connection', 'server',
); );
/* If a device gets disconnected without being cleaned up properly, /* If a device gets disconnected without being cleaned up properly,
@@ -327,6 +332,7 @@ class ConnectionTracker {
this.connectionProblemThreshold this.connectionProblemThreshold
} times within ${this.timeWindowMillis / 1000}s.`, } times within ${this.timeWindowMillis / 1000}s.`,
), ),
'server',
); );
} }
} }