imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace console.error with logger.error

Browse source 
Related https://github.com/vector-im/element-web/issues/18425
This commit is contained in:
Dariusz Niemczyk 2021-10-15 16:30:53 +02:00 • committed by Dariusz Niemczyk
parent 9c594a8a96
commit 5e73a212f4
124 changed files with 417 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/settings/CrossSigningPanel.tsx
View file

@ -28,6 +28,8 @@ import { MatrixEvent } from 'matrix-js-sdk/src';
import SetupEncryptionDialog from '../dialogs/security/SetupEncryptionDialog';
import { accessSecretStorage } from '../../../SecurityManager';
import { logger } from "matrix-js-sdk/src/logger";
interface IState {
error?: Error;
crossSigningPublicKeysOnDevice?: boolean;
@ -147,7 +149,7 @@ export default class CrossSigningPanel extends React.PureComponent<{}, IState> {
});
} catch (e) {
this.setState({ error: e });
console.error("Error bootstrapping cross-signing", e);
logger.error("Error bootstrapping cross-signing", e);
}
if (this.unmounted) return;
this.getUpdatedStatus();

6
src/components/views/settings/DevicesPanel.tsx
View file

@ -28,6 +28,8 @@ import DevicesPanelEntry from "./DevicesPanelEntry";
import Spinner from "../elements/Spinner";
import AccessibleButton from "../elements/AccessibleButton";
import { logger } from "matrix-js-sdk/src/logger";
interface IProps {
className?: string;
}
@ -72,7 +74,7 @@ export default class DevicesPanel extends React.Component<IProps, IState> {
// 404 probably means the HS doesn't yet support the API.
errtxt = _t("Your homeserver does not support session management.");
} else {
console.error("Error loading sessions:", error);
logger.error("Error loading sessions:", error);
errtxt = _t("Unable to load session list");
}
this.setState({ deviceLoadError: errtxt });
@ -159,7 +161,7 @@ export default class DevicesPanel extends React.Component<IProps, IState> {
},
});
}).catch((e) => {
console.error("Error deleting sessions", e);
logger.error("Error deleting sessions", e);
if (this.unmounted) { return; }
}).finally(() => {
this.setState({

4
src/components/views/settings/DevicesPanelEntry.tsx
View file

@ -24,6 +24,8 @@ import StyledCheckbox from '../elements/StyledCheckbox';
import { replaceableComponent } from "../../../utils/replaceableComponent";
import EditableTextContainer from "../elements/EditableTextContainer";
import { logger } from "matrix-js-sdk/src/logger";
interface IProps {
device?: IMyDevice;
onDeviceToggled?: (device: IMyDevice) => void;
@ -41,7 +43,7 @@ export default class DevicesPanelEntry extends React.Component<IProps> {
return MatrixClientPeg.get().setDeviceDetails(device.device_id, {
display_name: value,
}).catch((e) => {
console.error("Error setting session display name", e);
logger.error("Error setting session display name", e);
throw new Error(_t("Failed to set display name"));
});
};

12
src/components/views/settings/Notifications.tsx
View file

@ -39,6 +39,8 @@ import TagComposer from "../elements/TagComposer";
import { objectClone } from "../../../utils/objects";
import { arrayDiff } from "../../../utils/arrays";
import { logger } from "matrix-js-sdk/src/logger";
// TODO: this "view" component still has far too much application logic in it,
// which should be factored out to other files.
@ -139,7 +141,7 @@ export default class Notifications extends React.PureComponent<IProps, IState> {
phase: Phase.Ready,
});
} catch (e) {
console.error("Error setting up notifications for settings: ", e);
logger.error("Error setting up notifications for settings: ", e);
this.setState({ phase: Phase.Error });
}
}
@ -264,7 +266,7 @@ export default class Notifications extends React.PureComponent<IProps, IState> {
await this.refreshFromServer();
} catch (e) {
this.setState({ phase: Phase.Error });
console.error("Error updating master push rule:", e);
logger.error("Error updating master push rule:", e);
this.showSaveError();
}
};
@ -298,7 +300,7 @@ export default class Notifications extends React.PureComponent<IProps, IState> {
await this.refreshFromServer();
} catch (e) {
this.setState({ phase: Phase.Error });
console.error("Error updating email pusher:", e);
logger.error("Error updating email pusher:", e);
this.showSaveError();
}
};
@ -367,7 +369,7 @@ export default class Notifications extends React.PureComponent<IProps, IState> {
await this.refreshFromServer();
} catch (e) {
this.setState({ phase: Phase.Error });
console.error("Error updating push rule:", e);
logger.error("Error updating push rule:", e);
this.showSaveError();
}
};
@ -427,7 +429,7 @@ export default class Notifications extends React.PureComponent<IProps, IState> {
await this.refreshFromServer();
} catch (e) {
this.setState({ phase: Phase.Error });
console.error("Error updating keyword push rules:", e);
logger.error("Error updating keyword push rules:", e);
this.showSaveError();
}
}

2
src/components/views/settings/SecureBackupPanel.tsx
View file

@ -210,7 +210,7 @@ export default class SecureBackupPanel extends React.PureComponent<{}, IState> {
try {
await accessSecretStorage(async () => { }, /* forceReset = */ true);
} catch (e) {
console.error("Error resetting secret storage", e);
logger.error("Error resetting secret storage", e);
if (this.unmounted) return;
this.setState({ error: e });
}

4
src/components/views/settings/SetIdServer.tsx
View file

@ -32,6 +32,8 @@ import AccessibleButton from '../elements/AccessibleButton';
import Field from '../elements/Field';
import QuestionDialog from "../dialogs/QuestionDialog";
import { logger } from "matrix-js-sdk/src/logger";
// We'll wait up to this long when checking for 3PID bindings on the IS.
const REACHABILITY_TIMEOUT = 10000; // ms
@ -206,7 +208,7 @@ export default class SetIdServer extends React.Component<IProps, IState> {
this.saveIdServer(fullUrl);
}
} catch (e) {
console.error(e);
logger.error(e);
errStr = _t("Terms of service not accepted or the identity server is invalid.");
}
}

6
src/components/views/settings/SetIntegrationManager.tsx
View file

@ -23,6 +23,8 @@ import SettingsStore from "../../../settings/SettingsStore";
import { SettingLevel } from "../../../settings/SettingLevel";
import { replaceableComponent } from "../../../utils/replaceableComponent";
import { logger } from "matrix-js-sdk/src/logger";
interface IProps {
}
@ -48,8 +50,8 @@ export default class SetIntegrationManager extends React.Component<IProps, IStat
private onProvisioningToggled = (): void => {
const current = this.state.provisioningEnabled;
SettingsStore.setValue("integrationProvisioning", null, SettingLevel.ACCOUNT, !current).catch(err => {
console.error("Error changing integration manager provisioning");
console.error(err);
logger.error("Error changing integration manager provisioning");
logger.error(err);
this.setState({ provisioningEnabled: current });
});

8
src/components/views/settings/account/EmailAddresses.tsx
View file

@ -27,6 +27,8 @@ import { replaceableComponent } from "../../../../utils/replaceableComponent";
import ErrorDialog from "../../dialogs/ErrorDialog";
import { IThreepid, ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
import { logger } from "matrix-js-sdk/src/logger";
/*
TODO: Improve the UX for everything in here.
It's very much placeholder, but it gets the job done. The old way of handling
@ -78,7 +80,7 @@ export class ExistingEmailAddress extends React.Component<IExistingEmailAddressP
MatrixClientPeg.get().deleteThreePid(this.props.email.medium, this.props.email.address).then(() => {
return this.props.onRemoved(this.props.email);
}).catch((err) => {
console.error("Unable to remove contact information: " + err);
logger.error("Unable to remove contact information: " + err);
Modal.createTrackedDialog('Remove 3pid failed', '', ErrorDialog, {
title: _t("Unable to remove contact information"),
description: ((err && err.message) ? err.message : _t("Operation failed")),
@ -181,7 +183,7 @@ export default class EmailAddresses extends React.Component<IProps, IState> {
task.addEmailAddress(email).then(() => {
this.setState({ continueDisabled: false });
}).catch((err) => {
console.error("Unable to add email address " + email + " " + err);
logger.error("Unable to add email address " + email + " " + err);
this.setState({ verifying: false, continueDisabled: false, addTask: null });
Modal.createTrackedDialog('Unable to add email address', '', ErrorDialog, {
title: _t("Unable to add email address"),
@ -221,7 +223,7 @@ export default class EmailAddresses extends React.Component<IProps, IState> {
"and then click continue again."),
});
} else {
console.error("Unable to verify email address: ", err);
logger.error("Unable to verify email address: ", err);
Modal.createTrackedDialog('Unable to verify email address', '', ErrorDialog, {
title: _t("Unable to verify email address."),
description: ((err && err.message) ? err.message : _t("Operation failed")),

8
src/components/views/settings/account/PhoneNumbers.tsx
View file

@ -28,6 +28,8 @@ import { IThreepid, ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
import ErrorDialog from "../../dialogs/ErrorDialog";
import { PhoneNumberCountryDefinition } from "../../../../phonenumber";
import { logger } from "matrix-js-sdk/src/logger";
/*
TODO: Improve the UX for everything in here.
This is a copy/paste of EmailAddresses, mostly.
@ -74,7 +76,7 @@ export class ExistingPhoneNumber extends React.Component<IExistingPhoneNumberPro
MatrixClientPeg.get().deleteThreePid(this.props.msisdn.medium, this.props.msisdn.address).then(() => {
return this.props.onRemoved(this.props.msisdn);
}).catch((err) => {
console.error("Unable to remove contact information: " + err);
logger.error("Unable to remove contact information: " + err);
Modal.createTrackedDialog('Remove 3pid failed', '', ErrorDialog, {
title: _t("Unable to remove contact information"),
description: ((err && err.message) ? err.message : _t("Operation failed")),
@ -183,7 +185,7 @@ export default class PhoneNumbers extends React.Component<IProps, IState> {
task.addMsisdn(phoneCountry, phoneNumber).then((response) => {
this.setState({ continueDisabled: false, verifyMsisdn: response.msisdn });
}).catch((err) => {
console.error("Unable to add phone number " + phoneNumber + " " + err);
logger.error("Unable to add phone number " + phoneNumber + " " + err);
this.setState({ verifying: false, continueDisabled: false, addTask: null });
Modal.createTrackedDialog('Add Phone Number Error', '', ErrorDialog, {
title: _t("Error"),
@ -221,7 +223,7 @@ export default class PhoneNumbers extends React.Component<IProps, IState> {
}).catch((err) => {
this.setState({ continueDisabled: false });
if (err.errcode !== 'M_THREEPID_AUTH_FAILED') {
console.error("Unable to verify phone number: " + err);
logger.error("Unable to verify phone number: " + err);
Modal.createTrackedDialog('Unable to verify phone number', '', ErrorDialog, {
title: _t("Unable to verify phone number."),
description: ((err && err.message) ? err.message : _t("Operation failed")),

8
src/components/views/settings/discovery/EmailAddresses.tsx
View file

@ -26,6 +26,8 @@ import { IThreepid } from "matrix-js-sdk/src/@types/threepids";
import ErrorDialog from "../../dialogs/ErrorDialog";
import AccessibleButton from "../../elements/AccessibleButton";
import { logger } from "matrix-js-sdk/src/logger";
/*
TODO: Improve the UX for everything in here.
It's very much placeholder, but it gets the job done. The old way of handling
@ -98,7 +100,7 @@ export class EmailAddress extends React.Component<IEmailAddressProps, IEmailAddr
}
this.setState({ bound: bind });
} catch (err) {
console.error(`Unable to ${label} email address ${address} ${err}`);
logger.error(`Unable to ${label} email address ${address} ${err}`);
this.setState({
verifying: false,
continueDisabled: false,
@ -133,7 +135,7 @@ export class EmailAddress extends React.Component<IEmailAddressProps, IEmailAddr
bound: bind,
});
} catch (err) {
console.error(`Unable to ${label} email address ${address} ${err}`);
logger.error(`Unable to ${label} email address ${address} ${err}`);
this.setState({
verifying: false,
continueDisabled: false,
@ -187,7 +189,7 @@ export class EmailAddress extends React.Component<IEmailAddressProps, IEmailAddr
"and then click continue again."),
});
} else {
console.error("Unable to verify email address: " + err);
logger.error("Unable to verify email address: " + err);
Modal.createTrackedDialog('Unable to verify email address', '', ErrorDialog, {
title: _t("Unable to verify email address."),
description: ((err && err.message) ? err.message : _t("Operation failed")),

8
src/components/views/settings/discovery/PhoneNumbers.tsx
View file

@ -27,6 +27,8 @@ import ErrorDialog from "../../dialogs/ErrorDialog";
import Field from "../../elements/Field";
import AccessibleButton from "../../elements/AccessibleButton";
import { logger } from "matrix-js-sdk/src/logger";
/*
TODO: Improve the UX for everything in here.
This is a copy/paste of EmailAddresses, mostly.
@ -98,7 +100,7 @@ export class PhoneNumber extends React.Component<IPhoneNumberProps, IPhoneNumber
}
this.setState({ bound: bind });
} catch (err) {
console.error(`Unable to ${label} phone number ${address} ${err}`);
logger.error(`Unable to ${label} phone number ${address} ${err}`);
this.setState({
verifying: false,
continueDisabled: false,
@ -137,7 +139,7 @@ export class PhoneNumber extends React.Component<IPhoneNumberProps, IPhoneNumber
bound: bind,
});
} catch (err) {
console.error(`Unable to ${label} phone number ${address} ${err}`);
logger.error(`Unable to ${label} phone number ${address} ${err}`);
this.setState({
verifying: false,
continueDisabled: false,
@ -194,7 +196,7 @@ export class PhoneNumber extends React.Component<IPhoneNumberProps, IPhoneNumber
} catch (err) {
this.setState({ continueDisabled: false });
if (err.errcode !== 'M_THREEPID_AUTH_FAILED') {
console.error("Unable to verify phone number: " + err);
logger.error("Unable to verify phone number: " + err);
Modal.createTrackedDialog('Unable to verify phone number', '', ErrorDialog, {
title: _t("Unable to verify phone number."),
description: ((err && err.message) ? err.message : _t("Operation failed")),

6
src/components/views/settings/tabs/room/NotificationSettingsTab.tsx
View file

@ -23,6 +23,8 @@ import SettingsStore from '../../../../../settings/SettingsStore';
import { SettingLevel } from "../../../../../settings/SettingLevel";
import { replaceableComponent } from "../../../../../utils/replaceableComponent";
import { logger } from "matrix-js-sdk/src/logger";
interface IProps {
roomId: string;
}
@ -83,10 +85,10 @@ export default class NotificationsSettingsTab extends React.Component<IProps, IS
try {
await this.saveSound();
} catch (ex) {
console.error(
logger.error(
`Unable to save notification sound for ${this.props.roomId}`,
);
console.error(ex);
logger.error(ex);
}
};

8
src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx
View file

@ -28,6 +28,8 @@ import { compare } from "../../../../../utils/strings";
import ErrorDialog from '../../../dialogs/ErrorDialog';
import PowerSelector from "../../../elements/PowerSelector";
import { logger } from "matrix-js-sdk/src/logger";
interface IEventShowOpts {
isState?: boolean;
hideForSpace?: boolean;
@ -72,7 +74,7 @@ interface IBannedUserProps {
export class BannedUser extends React.Component<IBannedUserProps> {
private onUnbanClick = (e) => {
MatrixClientPeg.get().unban(this.props.member.roomId, this.props.member.userId).catch((err) => {
console.error("Failed to unban: " + err);
logger.error("Failed to unban: " + err);
Modal.createTrackedDialog('Failed to unban', '', ErrorDialog, {
title: _t('Error'),
description: _t('Failed to unban'),
@ -167,7 +169,7 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
}
client.sendStateEvent(this.props.roomId, EventType.RoomPowerLevels, plContent).catch(e => {
console.error(e);
logger.error(e);
Modal.createTrackedDialog('Power level requirement change failed', '', ErrorDialog, {
title: _t('Error changing power level requirement'),
@ -193,7 +195,7 @@ export default class RolesRoomSettingsTab extends React.Component<IProps> {
plContent['users'][powerLevelKey] = value;
client.sendStateEvent(this.props.roomId, EventType.RoomPowerLevels, plContent).catch(e => {
console.error(e);
logger.error(e);
Modal.createTrackedDialog('Power level change failed', '', ErrorDialog, {
title: _t('Error changing power level'),

8
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
View file

@ -36,6 +36,8 @@ import CreateRoomDialog from '../../../dialogs/CreateRoomDialog';
import JoinRuleSettings from "../../JoinRuleSettings";
import ErrorDialog from "../../../dialogs/ErrorDialog";
import { logger } from "matrix-js-sdk/src/logger";
interface IProps {
roomId: string;
closeSettingsFn: () => void;
@ -180,7 +182,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
this.props.roomId, EventType.RoomEncryption,
{ algorithm: "m.megolm.v1.aes-sha2" },
).catch((e) => {
console.error(e);
logger.error(e);
this.setState({ encrypted: beforeEncrypted });
});
},
@ -198,7 +200,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
client.sendStateEvent(this.props.roomId, EventType.RoomGuestAccess, {
guest_access: guestAccess,
}, "").catch((e) => {
console.error(e);
logger.error(e);
this.setState({ guestAccess: beforeGuestAccess });
});
};
@ -225,7 +227,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
MatrixClientPeg.get().sendStateEvent(this.props.roomId, EventType.RoomHistoryVisibility, {
history_visibility: history,
}, "").catch((e) => {
console.error(e);
logger.error(e);
this.setState({ history: beforeHistory });
});
};

4
src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx
View file

@ -41,6 +41,8 @@ import { replaceableComponent } from "../../../../../utils/replaceableComponent"
import { compare } from "../../../../../utils/strings";
import LayoutSwitcher from "../../LayoutSwitcher";
import { logger } from "matrix-js-sdk/src/logger";
interface IProps {
}
@ -225,7 +227,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
}
currentThemes.push(themeInfo);
} catch (e) {
console.error(e);
logger.error(e);
this.setState({ customThemeMessage: { text: _t("Error downloading theme information."), isError: true } });
return; // Don't continue on error
}

4
src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
View file

@ -50,6 +50,8 @@ import InlineTermsAgreement from "../../../terms/InlineTermsAgreement";
import SetIdServer from "../../SetIdServer";
import SetIntegrationManager from "../../SetIntegrationManager";
import { logger } from "matrix-js-sdk/src/logger";
interface IProps {
closeSettingsFn: () => void;
}
@ -253,7 +255,7 @@ export default class GeneralUserSettingsTab extends React.Component<IProps, ISta
} else if (!errMsg) {
errMsg += ` (HTTP status ${err.httpStatus})`;
}
console.error("Failed to change password: " + errMsg);
logger.error("Failed to change password: " + errMsg);
Modal.createTrackedDialog('Failed to change password', '', ErrorDialog, {
title: _t("Error"),
description: errMsg,

4
src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
View file

@ -58,10 +58,10 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
componentDidMount(): void {
PlatformPeg.get().getAppVersion().then((ver) => this.setState({ appVersion: ver })).catch((e) => {
console.error("Error getting vector version: ", e);
logger.error("Error getting vector version: ", e);
});
PlatformPeg.get().canSelfUpdate().then((v) => this.setState({ canUpdate: v })).catch((e) => {
console.error("Error getting self updatability: ", e);
logger.error("Error getting self updatability: ", e);
});
}

10
src/components/views/settings/tabs/user/MjolnirUserSettingsTab.tsx
View file

@ -28,6 +28,8 @@ import QuestionDialog from "../../../dialogs/QuestionDialog";
import AccessibleButton from "../../../elements/AccessibleButton";
import Field from "../../../elements/Field";
import { logger } from "matrix-js-sdk/src/logger";
interface IState {
busy: boolean;
newPersonalRule: string;
@ -69,7 +71,7 @@ export default class MjolnirUserSettingsTab extends React.Component<{}, IState>
await list.banEntity(kind, this.state.newPersonalRule, _t("Ignored/Blocked"));
this.setState({ newPersonalRule: "" }); // this will also cause the new rule to be rendered
} catch (e) {
console.error(e);
logger.error(e);
Modal.createTrackedDialog('Failed to add Mjolnir rule', '', ErrorDialog, {
title: _t('Error adding ignored user/server'),
@ -90,7 +92,7 @@ export default class MjolnirUserSettingsTab extends React.Component<{}, IState>
await Mjolnir.sharedInstance().subscribeToList(room.roomId);
this.setState({ newList: "" }); // this will also cause the new rule to be rendered
} catch (e) {
console.error(e);
logger.error(e);
Modal.createTrackedDialog('Failed to subscribe to Mjolnir list', '', ErrorDialog, {
title: _t('Error subscribing to list'),
@ -107,7 +109,7 @@ export default class MjolnirUserSettingsTab extends React.Component<{}, IState>
const list = Mjolnir.sharedInstance().getPersonalList();
await list.unbanEntity(rule.kind, rule.entity);
} catch (e) {
console.error(e);
logger.error(e);
Modal.createTrackedDialog('Failed to remove Mjolnir rule', '', ErrorDialog, {
title: _t('Error removing ignored user/server'),
@ -124,7 +126,7 @@ export default class MjolnirUserSettingsTab extends React.Component<{}, IState>
await Mjolnir.sharedInstance().unsubscribeFromList(list.roomId);
await MatrixClientPeg.get().leave(list.roomId);
} catch (e) {
console.error(e);
logger.error(e);
Modal.createTrackedDialog('Failed to unsubscribe from Mjolnir list', '', ErrorDialog, {
title: _t('Error unsubscribing from list'),