Simplify logging
This commit is contained in:
parent
56ffd7bc3f
commit
618a7725fe
1 changed files with 53 additions and 6 deletions
|
@ -133,6 +133,40 @@ function isScreenSource(source: PresentedSource): boolean {
|
||||||
return source.id.startsWith('screen');
|
return source.id.startsWith('screen');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function truncateForLogging(name: string | undefined): string | undefined {
|
||||||
|
if (!name || name.length <= 4) {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
return `${name.slice(0, 2)}...${name.slice(-2)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function cleanForLogging(settings?: MediaDeviceSettings): unknown {
|
||||||
|
if (!settings) {
|
||||||
|
return settings;
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
availableCameras: settings.availableCameras.map(camera => {
|
||||||
|
const { deviceId, kind, label, groupId } = camera;
|
||||||
|
return {
|
||||||
|
deviceId,
|
||||||
|
kind,
|
||||||
|
label: truncateForLogging(label),
|
||||||
|
groupId,
|
||||||
|
};
|
||||||
|
}),
|
||||||
|
availableMicrophones: settings.availableMicrophones.map(device => {
|
||||||
|
return truncateForLogging(device.name);
|
||||||
|
}),
|
||||||
|
availableSpeakers: settings.availableSpeakers.map(device => {
|
||||||
|
return truncateForLogging(device.name);
|
||||||
|
}),
|
||||||
|
selectedMicrophone: truncateForLogging(settings.selectedMicrophone?.name),
|
||||||
|
selectedSpeaker: truncateForLogging(settings.selectedSpeaker?.name),
|
||||||
|
selectedCamera: settings.selectedCamera,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
function translateSourceName(
|
function translateSourceName(
|
||||||
i18n: LocalizerType,
|
i18n: LocalizerType,
|
||||||
source: PresentedSource
|
source: PresentedSource
|
||||||
|
@ -1324,8 +1358,8 @@ export class CallingClass {
|
||||||
) {
|
) {
|
||||||
log.info(
|
log.info(
|
||||||
'MediaDevice: available devices changed (from->to)',
|
'MediaDevice: available devices changed (from->to)',
|
||||||
this.lastMediaDeviceSettings,
|
cleanForLogging(this.lastMediaDeviceSettings),
|
||||||
newSettings
|
cleanForLogging(newSettings)
|
||||||
);
|
);
|
||||||
|
|
||||||
await this.selectPreferredDevices(newSettings);
|
await this.selectPreferredDevices(newSettings);
|
||||||
|
@ -1398,13 +1432,21 @@ export class CallingClass {
|
||||||
}
|
}
|
||||||
|
|
||||||
setPreferredMicrophone(device: AudioDevice): void {
|
setPreferredMicrophone(device: AudioDevice): void {
|
||||||
log.info('MediaDevice: setPreferredMicrophone', device);
|
log.info(
|
||||||
|
'MediaDevice: setPreferredMicrophone',
|
||||||
|
device.index,
|
||||||
|
truncateForLogging(device.name)
|
||||||
|
);
|
||||||
window.Events.setPreferredAudioInputDevice(device);
|
window.Events.setPreferredAudioInputDevice(device);
|
||||||
RingRTC.setAudioInput(device.index);
|
RingRTC.setAudioInput(device.index);
|
||||||
}
|
}
|
||||||
|
|
||||||
setPreferredSpeaker(device: AudioDevice): void {
|
setPreferredSpeaker(device: AudioDevice): void {
|
||||||
log.info('MediaDevice: setPreferredSpeaker', device);
|
log.info(
|
||||||
|
'MediaDevice: setPreferredSpeaker',
|
||||||
|
device.index,
|
||||||
|
truncateForLogging(device.name)
|
||||||
|
);
|
||||||
window.Events.setPreferredAudioOutputDevice(device);
|
window.Events.setPreferredAudioOutputDevice(device);
|
||||||
RingRTC.setAudioOutput(device.index);
|
RingRTC.setAudioOutput(device.index);
|
||||||
}
|
}
|
||||||
|
@ -1532,13 +1574,18 @@ export class CallingClass {
|
||||||
if (settings.selectedMicrophone) {
|
if (settings.selectedMicrophone) {
|
||||||
log.info(
|
log.info(
|
||||||
'MediaDevice: selecting microphone',
|
'MediaDevice: selecting microphone',
|
||||||
settings.selectedMicrophone
|
settings.selectedMicrophone.index,
|
||||||
|
truncateForLogging(settings.selectedMicrophone.name)
|
||||||
);
|
);
|
||||||
RingRTC.setAudioInput(settings.selectedMicrophone.index);
|
RingRTC.setAudioInput(settings.selectedMicrophone.index);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (settings.selectedSpeaker) {
|
if (settings.selectedSpeaker) {
|
||||||
log.info('MediaDevice: selecting speaker', settings.selectedSpeaker);
|
log.info(
|
||||||
|
'MediaDevice: selecting speaker',
|
||||||
|
settings.selectedSpeaker.index,
|
||||||
|
truncateForLogging(settings.selectedSpeaker.name)
|
||||||
|
);
|
||||||
RingRTC.setAudioOutput(settings.selectedSpeaker.index);
|
RingRTC.setAudioOutput(settings.selectedSpeaker.index);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue