Skip to content

Regression: Problem with Importer's logs #21812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sampaiodiego merged 5 commits into from
Apr 27, 2021
Merged

Regression: Problem with Importer's logs #21812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d0c0410
Regression: Fixed Importer's logs
pierre-lehnen-rc Apr 26, 2021
bc805a5
Fixed definitions
pierre-lehnen-rc Apr 26, 2021
ab6aeec
Removed Null
pierre-lehnen-rc Apr 26, 2021
7b564f0
Merge branch 'develop' into regression.importer-logs
sampaiodiego Apr 27, 2021
bcf0df6
Merge branch 'develop' into regression.importer-logs
sampaiodiego Apr 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 23 additions & 14 deletions app/importer/server/classes/ImportDataConverter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ import { generateUsernameSuggestion, insertMessage } from '../../../lib/server';
import { setUserActiveStatus } from '../../../lib/server/functions/setUserActiveStatus';
import { IUser } from '../../../../definition/IUser';

// @ts-ignore //@ToDo: Add the Logger class definitions.
type FakeLogger = Logger;

type IRoom = Record<string, any>;
type IMessage = Record<string, any>;
type IUserIdentification = {
Expand Down Expand Up @@ -61,13 +64,19 @@ export class ImportDataConverter {

private _roomNameCache: Map<string, string>;

private _logger: FakeLogger;

constructor() {
this._userCache = new Map();
this._userDisplayNameCache = new Map();
this._roomCache = new Map();
this._roomNameCache = new Map();
}

setLogger(logger: FakeLogger): void {
this._logger = logger;
}

addUserToCache(importId: string, _id: string, username: string | undefined): IUserIdentification {
const cache = {
_id,
Expand Down Expand Up @@ -161,8 +170,8 @@ export class ImportDataConverter {
try {
Users.update({ _id: existingUser._id }, { $set: { _pendingAvatarUrl: userData.avatarUrl } });
} catch (error) {
console.warn(`Failed to set ${ existingUser._id }'s avatar from url ${ userData.avatarUrl }`);
console.error(error);
this._logger.warn(`Failed to set ${ existingUser._id }'s avatar from url ${ userData.avatarUrl }`);
this._logger.error(error);
}
}
}
Expand Down Expand Up @@ -202,8 +211,8 @@ export class ImportDataConverter {
try {
Users.update({ _id: userId }, { $set: { _pendingAvatarUrl: userData.avatarUrl } });
} catch (error) {
console.warn(`Failed to set ${ userId }'s avatar from url ${ userData.avatarUrl }`);
console.error(error);
this._logger.warn(`Failed to set ${ userId }'s avatar from url ${ userData.avatarUrl }`);
this._logger.error(error);
}
}
});
Expand Down Expand Up @@ -279,7 +288,7 @@ export class ImportDataConverter {
}

saveError(importId: string, error: Error): void {
console.error(error);
this._logger.error(error);
ImportData.update({
_id: importId,
}, {
Expand Down Expand Up @@ -400,7 +409,7 @@ export class ImportDataConverter {
const _id = this.findImportedRoomId(importId);

if (!_id || !name) {
console.warn(`Mentioned room not found: ${ importId }`);
this._logger.warn(`Mentioned room not found: ${ importId }`);
continue;
}

Expand Down Expand Up @@ -431,7 +440,7 @@ export class ImportDataConverter {

const creator = this.findImportedUser(m.u._id);
if (!creator) {
console.warn(`Imported user not found: ${ m.u._id }`);
this._logger.warn(`Imported user not found: ${ m.u._id }`);
throw new Error('importer-message-unknown-user');
}

Expand Down Expand Up @@ -484,8 +493,8 @@ export class ImportDataConverter {
try {
insertMessage(creator, msgObj, rid, true);
} catch (e) {
console.warn(`Failed to import message with timestamp ${ String(msgObj.ts) } to room ${ rid }`);
console.error(e);
this._logger.warn(`Failed to import message with timestamp ${ String(msgObj.ts) } to room ${ rid }`);
this._logger.error(e);
}

if (afterImportFn) {
Expand All @@ -500,8 +509,8 @@ export class ImportDataConverter {
try {
Rooms.resetLastMessageById(rid);
} catch (e) {
console.warn(`Failed to update last message of room ${ rid }`);
console.error(e);
this._logger.warn(`Failed to update last message of room ${ rid }`);
this._logger.error(e);
}
}
}
Expand Down Expand Up @@ -685,7 +694,7 @@ export class ImportDataConverter {

if (roomData.t === 'd') {
if (members.length < roomData.users.length) {
console.warn('One or more imported users not found: ${ roomData.users }');
this._logger.warn(`One or more imported users not found: ${ roomData.users }`);
throw new Error('importer-channel-missing-users');
}
}
Expand All @@ -700,8 +709,8 @@ export class ImportDataConverter {
roomData._id = roomInfo.rid;
});
} catch (e) {
console.warn(roomData.name, members);
console.error(e);
this._logger.warn(roomData.name, members);
this._logger.error(e);
throw e;
}

Expand Down
3 changes: 2 additions & 1 deletion app/importer/server/classes/ImporterBase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ export class Base {
this.info = info;

this.logger = new Logger(`${ this.info.name } Importer`, {});
this.converter.setLogger(this.logger);

this.progress = new Progress(this.info.key, this.info.name);
this.collection = RawImports;

Expand Down Expand Up @@ -158,7 +160,6 @@ export class Base {
this.reloadCount();
const started = Date.now();
const startedByUserId = Meteor.userId();
console.log(importSelection);

const beforeImportFn = (data, type) => {
switch (type) {
Expand Down