chore: move logger to a separate package (#30092)

pull/30118/head
Pierre Lehnen 2 years ago committed by GitHub
parent 06d24c19a7
commit fe6f5cdf88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      _templates/package/new/package.json.ejs.t
  2. 16
      _templates/service/new/package.json.ejs.t
  3. 2
      apps/meteor/app/api/server/api.ts
  4. 2
      apps/meteor/app/api/server/definition.ts
  5. 2
      apps/meteor/app/api/server/v1/voip/logger.ts
  6. 2
      apps/meteor/app/authentication/server/lib/restrictLoginAttempts.ts
  7. 2
      apps/meteor/app/autotranslate/server/autotranslate.ts
  8. 2
      apps/meteor/app/autotranslate/server/logger.ts
  9. 2
      apps/meteor/app/cas/server/cas_rocketchat.js
  10. 2
      apps/meteor/app/cors/server/cors.ts
  11. 2
      apps/meteor/app/crowd/server/logger.ts
  12. 2
      apps/meteor/app/custom-oauth/server/custom_oauth_server.js
  13. 2
      apps/meteor/app/federation/server/lib/logger.js
  14. 2
      apps/meteor/app/file-upload/server/config/GridFS.ts
  15. 2
      apps/meteor/app/file-upload/server/lib/proxy.ts
  16. 2
      apps/meteor/app/importer/server/classes/ImportDataConverter.ts
  17. 2
      apps/meteor/app/importer/server/classes/ImporterBase.js
  18. 2
      apps/meteor/app/integrations/server/logger.ts
  19. 2
      apps/meteor/app/irc/server/irc-bridge/index.js
  20. 3
      apps/meteor/app/irc/server/servers/RFC2813/index.js
  21. 2
      apps/meteor/app/lib/server/functions/getFullUserData.ts
  22. 2
      apps/meteor/app/lib/server/lib/bugsnag.ts
  23. 2
      apps/meteor/app/lib/server/lib/debug.js
  24. 2
      apps/meteor/app/lib/server/lib/deprecationWarningLogger.ts
  25. 2
      apps/meteor/app/lib/server/startup/oAuthServicesUpdate.js
  26. 2
      apps/meteor/app/lib/server/startup/rateLimiter.js
  27. 2
      apps/meteor/app/livechat/server/lib/Analytics.js
  28. 2
      apps/meteor/app/livechat/server/lib/Departments.ts
  29. 2
      apps/meteor/app/livechat/server/lib/Helper.ts
  30. 2
      apps/meteor/app/livechat/server/lib/Livechat.js
  31. 3
      apps/meteor/app/livechat/server/lib/LivechatTyped.ts
  32. 2
      apps/meteor/app/livechat/server/lib/QueueManager.ts
  33. 2
      apps/meteor/app/livechat/server/lib/RoutingManager.ts
  34. 2
      apps/meteor/app/livechat/server/lib/logger.ts
  35. 3
      apps/meteor/app/livechat/server/lib/stream/agentStatus.ts
  36. 2
      apps/meteor/app/logger/server/index.ts
  37. 2
      apps/meteor/app/message-mark-as-unread/server/logger.ts
  38. 3
      apps/meteor/app/meteor-accounts-saml/server/lib/Utils.ts
  39. 2
      apps/meteor/app/meteor-accounts-saml/server/startup.ts
  40. 2
      apps/meteor/app/oembed/server/server.ts
  41. 2
      apps/meteor/app/push/server/logger.ts
  42. 2
      apps/meteor/app/search/server/logger/logger.ts
  43. 2
      apps/meteor/app/slackbridge/server/logger.ts
  44. 2
      apps/meteor/app/statistics/server/lib/SAUMonitor.ts
  45. 2
      apps/meteor/app/utils/lib/templateVarHandler.ts
  46. 2
      apps/meteor/app/version-check/server/logger.ts
  47. 2
      apps/meteor/app/webdav/server/methods/uploadFileToWebdav.ts
  48. 2
      apps/meteor/ee/app/livechat-enterprise/server/lib/AutoCloseOnHoldScheduler.ts
  49. 2
      apps/meteor/ee/app/livechat-enterprise/server/lib/AutoTransferChatScheduler.ts
  50. 2
      apps/meteor/ee/app/livechat-enterprise/server/lib/QueueInactivityMonitor.ts
  51. 2
      apps/meteor/ee/app/livechat-enterprise/server/lib/VisitorInactivityMonitor.ts
  52. 2
      apps/meteor/ee/app/livechat-enterprise/server/lib/logger.ts
  53. 2
      apps/meteor/ee/app/livechat-enterprise/server/services/omnichannel.internalService.ts
  54. 2
      apps/meteor/ee/server/apps/marketplace/appEnableCheck.ts
  55. 2
      apps/meteor/ee/server/apps/orchestrator.js
  56. 2
      apps/meteor/ee/server/configuration/oauth.ts
  57. 2
      apps/meteor/ee/server/lib/ldap/copyCustomFieldsLDAP.spec.ts
  58. 2
      apps/meteor/ee/server/lib/ldap/copyCustomFieldsLDAP.ts
  59. 2
      apps/meteor/ee/server/lib/oauth/Manager.ts
  60. 2
      apps/meteor/ee/server/services/package.json
  61. 2
      apps/meteor/lib/callbacks/callbacksBase.ts
  62. 3
      apps/meteor/package.json
  63. 2
      apps/meteor/server/cron/statistics.ts
  64. 2
      apps/meteor/server/database/DatabaseWatcher.ts
  65. 2
      apps/meteor/server/features/EmailInbox/logger.ts
  66. 1
      apps/meteor/server/importPackages.ts
  67. 2
      apps/meteor/server/lib/ldap/DataConverter.ts
  68. 2
      apps/meteor/server/lib/ldap/Logger.ts
  69. 5
      apps/meteor/server/lib/logger/startup.ts
  70. 2
      apps/meteor/server/lib/logger/system.ts
  71. 2
      apps/meteor/server/lib/migrations.ts
  72. 3
      apps/meteor/server/lib/settingsRegenerator.ts
  73. 2
      apps/meteor/server/models/raw/VoipRoom.ts
  74. 2
      apps/meteor/server/services/calendar/service.ts
  75. 2
      apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/logger.ts
  76. 2
      apps/meteor/server/services/omnichannel-voip/service.ts
  77. 2
      apps/meteor/server/services/startup.ts
  78. 2
      apps/meteor/server/services/voip/connector/asterisk/CommandHandler.ts
  79. 2
      apps/meteor/server/services/voip/connector/asterisk/ami/ACDQueue.ts
  80. 2
      apps/meteor/server/services/voip/connector/asterisk/ami/AMIConnection.ts
  81. 2
      apps/meteor/server/services/voip/connector/asterisk/ami/CommandFactory.ts
  82. 2
      apps/meteor/server/services/voip/connector/asterisk/ami/ContinuousMonitor.ts
  83. 2
      apps/meteor/server/services/voip/connector/asterisk/ami/PJSIPEndpoint.ts
  84. 2
      apps/meteor/server/services/voip/connector/websocket/WebsocketConnection.ts
  85. 2
      apps/meteor/server/services/voip/service.ts
  86. 2
      apps/meteor/server/startup/callbacks.ts
  87. 2
      apps/meteor/server/startup/cron.ts
  88. 2
      apps/meteor/server/startup/watchDb.ts
  89. 2
      apps/meteor/server/stream/stdout.ts
  90. 2
      ee/apps/account-service/package.json
  91. 2
      ee/apps/authorization-service/package.json
  92. 3
      ee/apps/ddp-streamer/Dockerfile
  93. 3
      ee/apps/ddp-streamer/package.json
  94. 2
      ee/apps/ddp-streamer/src/Server.ts
  95. 3
      ee/apps/omnichannel-transcript/Dockerfile
  96. 3
      ee/apps/omnichannel-transcript/package.json
  97. 2
      ee/apps/omnichannel-transcript/src/service.ts
  98. 2
      ee/apps/presence-service/package.json
  99. 3
      ee/apps/queue-worker/Dockerfile
  100. 3
      ee/apps/queue-worker/package.json
  101. Some files were not shown because too many files have changed in this diff Show More

@ -7,11 +7,11 @@ to: packages/<%= name %>/package.json
"version": "0.0.1",
"private": true,
"devDependencies": {
"@types/jest": "^27.4.1",
"@types/jest": "~29.5.3",
"eslint": "~8.45.0",
"jest": "~29.5.0",
"jest": "~29.6.1",
"ts-jest": "~29.0.5",
"typescript": "~5.0.2"
"typescript": "~5.1.6"
},
"scripts": {
"lint": "eslint --ext .js,.jsx,.ts,.tsx .",

@ -20,29 +20,29 @@ to: ee/apps/<%= name %>/package.json
"dependencies": {
"@rocket.chat/core-services": "workspace:^",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "0.31.22",
"@rocket.chat/emitter": "next",
"@rocket.chat/model-typings": "workspace:^",
"@rocket.chat/models": "workspace:^",
"@rocket.chat/rest-typings": "workspace:^",
"@rocket.chat/string-helpers": "0.31.22",
"@types/node": "^14.18.21",
"ejson": "^2.2.2",
"@rocket.chat/string-helpers": "next",
"@types/node": "^14.18.51",
"ejson": "^2.2.3",
"eventemitter3": "^4.0.7",
"fibers": "^5.0.3",
"mem": "^8.1.1",
"moleculer": "^0.14.21",
"moleculer": "^0.14.29",
"mongodb": "^4.12.1",
"nats": "^2.4.0",
"pino": "^8.4.2",
"pino": "^8.15.0",
"polka": "^0.5.2"
},
"devDependencies": {
"@rocket.chat/eslint-config": "workspace:^",
"@types/eslint": "^8.4.10",
"@types/eslint": "~8.44.0",
"@types/polka": "^0.5.4",
"eslint": "~8.45.0",
"ts-node": "^10.9.1",
"typescript": "~4.6.4"
"typescript": "~5.1.6"
},
"main": "./dist/ee/apps/<%= name %>/src/service.js",
"files": [

@ -1,4 +1,5 @@
import type { IMethodConnection, IUser, IRoom } from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import { Users } from '@rocket.chat/models';
import { Random } from '@rocket.chat/random';
import type { JoinPathPattern, Method } from '@rocket.chat/rest-typings';
@ -17,7 +18,6 @@ import { getRestPayload } from '../../../server/lib/logger/logPayloads';
import { checkCodeForUser } from '../../2fa/server/code';
import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission';
import { apiDeprecationLogger } from '../../lib/server/lib/deprecationWarningLogger';
import { Logger } from '../../logger/server';
import { metrics } from '../../metrics/server';
import { settings } from '../../settings/server';
import { getDefaultUserFields } from '../../utils/server/functions/getDefaultUserFields';

@ -1,10 +1,10 @@
import type { IUser } from '@rocket.chat/core-typings';
import type { Logger } from '@rocket.chat/logger';
import type { Method, MethodOf, OperationParams, OperationResult, PathPattern, UrlParams } from '@rocket.chat/rest-typings';
import type { ValidateFunction } from 'ajv';
import type { Request, Response } from 'express';
import type { ITwoFactorOptions } from '../../2fa/server/code';
import type { Logger } from '../../logger/server';
export type SuccessResult<T> = {
statusCode: 200;

@ -1,3 +1,3 @@
import { Logger } from '../../../../logger/server';
import { Logger } from '@rocket.chat/logger';
export const logger = new Logger('VoIP');

@ -1,11 +1,11 @@
import type { IServerEvent } from '@rocket.chat/core-typings';
import { ServerEventType } from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import { Rooms, ServerEvents, Users } from '@rocket.chat/models';
import { addMinutesToADate } from '../../../../lib/utils/addMinutesToADate';
import { getClientAddress } from '../../../../server/lib/getClientAddress';
import { sendMessage } from '../../../lib/server/functions/sendMessage';
import { Logger } from '../../../logger/server';
import { settings } from '../../../settings/server';
import type { ILoginAttempt } from '../ILoginAttempt';

@ -7,6 +7,7 @@ import type {
ISupportedLanguage,
ITranslationResult,
} from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import { Messages, Subscriptions } from '@rocket.chat/models';
import { escapeHTML } from '@rocket.chat/string-helpers';
import { Meteor } from 'meteor/meteor';
@ -14,7 +15,6 @@ import _ from 'underscore';
import { callbacks } from '../../../lib/callbacks';
import { isTruthy } from '../../../lib/isTruthy';
import { Logger } from '../../logger/server';
import { Markdown } from '../../markdown/server';
import { settings } from '../../settings/server';

@ -1,4 +1,4 @@
import { Logger } from '../../logger/server';
import { Logger } from '@rocket.chat/logger';
const logger = new Logger('AutoTranslate');

@ -1,6 +1,6 @@
import { Logger } from '@rocket.chat/logger';
import { ServiceConfiguration } from 'meteor/service-configuration';
import { Logger } from '../../logger/server';
import { settings } from '../../settings/server';
export const logger = new Logger('CAS');

@ -1,12 +1,12 @@
import type http from 'http';
import url from 'url';
import { Logger } from '@rocket.chat/logger';
import { Meteor } from 'meteor/meteor';
import type { StaticFiles } from 'meteor/webapp';
import { WebApp, WebAppInternals } from 'meteor/webapp';
import _ from 'underscore';
import { Logger } from '../../logger/server';
import { settings } from '../../settings/server';
// Taken from 'connect' types

@ -1,3 +1,3 @@
import { Logger } from '../../logger/server';
import { Logger } from '@rocket.chat/logger';
export const logger = new Logger('CROWD');

@ -1,4 +1,5 @@
import { LDAP } from '@rocket.chat/core-services';
import { Logger } from '@rocket.chat/logger';
import { Users } from '@rocket.chat/models';
import { serverFetch as fetch } from '@rocket.chat/server-fetch';
import { Accounts } from 'meteor/accounts-base';
@ -11,7 +12,6 @@ import _ from 'underscore';
import { callbacks } from '../../../lib/callbacks';
import { isURL } from '../../../lib/utils/isURL';
import { registerAccessTokenService } from '../../lib/server/oauth/oauth';
import { Logger } from '../../logger/server';
import { settings } from '../../settings/server';
import { normalizers, fromTemplate, renameInvalidProperties } from './transform_helpers';

@ -1,4 +1,4 @@
import { Logger } from '../../../logger/server';
import { Logger } from '@rocket.chat/logger';
const logger = new Logger('Federation');

@ -4,9 +4,9 @@ import stream from 'stream';
import zlib from 'zlib';
import type { IUpload } from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import { UploadFS } from '../../../../server/ufs';
import { Logger } from '../../../logger/server';
import { FileUploadClass, FileUpload } from '../lib/FileUpload';
import { getFileRange, setRangeHeaders } from '../lib/ranges';

@ -2,13 +2,13 @@ import http from 'http';
import URL from 'url';
import { InstanceStatus } from '@rocket.chat/instance-status';
import { Logger } from '@rocket.chat/logger';
import { InstanceStatus as InstanceStatusModel } from '@rocket.chat/models';
import type { NextFunction } from 'connect';
import type createServer from 'connect';
import { WebApp } from 'meteor/webapp';
import { UploadFS } from '../../../../server/ufs';
import { Logger } from '../../../logger/server';
import { isDocker } from '../../../utils/server/functions/isDocker';
const logger = new Logger('UploadProxy');

@ -12,6 +12,7 @@ import type {
IImportRecordType,
IMessage as IDBMessage,
} from '@rocket.chat/core-typings';
import type { Logger } from '@rocket.chat/logger';
import { ImportData, Rooms, Users, Subscriptions } from '@rocket.chat/models';
import { Random } from '@rocket.chat/random';
import { SHA256 } from '@rocket.chat/sha256';
@ -20,7 +21,6 @@ import { Accounts } from 'meteor/accounts-base';
import { ObjectId } from 'mongodb';
import { callbacks } from '../../../../lib/callbacks';
import type { Logger } from '../../../../server/lib/logger/Logger';
import { createDirectMessage } from '../../../../server/methods/createDirectMessage';
import { saveRoomSettings } from '../../../channel-settings/server/methods/saveRoomSettings';
import { addUserToDefaultChannels } from '../../../lib/server/functions/addUserToDefaultChannels';

@ -1,8 +1,8 @@
import { Logger } from '@rocket.chat/logger';
import { Settings, ImportData, Imports } from '@rocket.chat/models';
import AdmZip from 'adm-zip';
import { Selection, SelectionChannel, SelectionUser } from '..';
import { Logger } from '../../../logger/server';
import { t } from '../../../utils/lib/i18n';
import { ImporterInfo } from '../../lib/ImporterInfo';
import { ProgressStep, ImportPreparingStartedStates } from '../../lib/ImporterProgressStep';

@ -1,4 +1,4 @@
import { Logger } from '../../logger/server';
import { Logger } from '@rocket.chat/logger';
const logger = new Logger('Integrations');

@ -1,3 +1,4 @@
import { Logger } from '@rocket.chat/logger';
import { Settings } from '@rocket.chat/models';
import moment from 'moment';
import Queue from 'queue-fifo';
@ -6,7 +7,6 @@ import { callbacks } from '../../../../lib/callbacks';
import { afterLeaveRoomCallback } from '../../../../lib/callbacks/afterLeaveRoomCallback';
import { afterLogoutCleanUpCallback } from '../../../../lib/callbacks/afterLogoutCleanUpCallback';
import { withThrottling } from '../../../../lib/utils/highOrderFunctions';
import { Logger } from '../../../logger/server';
import * as servers from '../servers';
import * as localCommandHandlers from './localHandlers';
import * as peerCommandHandlers from './peerHandlers';

@ -2,7 +2,8 @@ import { EventEmitter } from 'events';
import net from 'net';
import util from 'util';
import { Logger } from '../../../../logger/server';
import { Logger } from '@rocket.chat/logger';
import localCommandHandlers from './localCommandHandlers';
import parseMessage from './parseMessage';
import peerCommandHandlers from './peerCommandHandlers';

@ -1,8 +1,8 @@
import type { IUser } from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import { Users } from '@rocket.chat/models';
import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
import { Logger } from '../../../logger/server';
import { settings } from '../../../settings/server';
const logger = new Logger('getFullUserData');

@ -1,7 +1,7 @@
import Bugsnag from '@bugsnag/js';
import { Logger } from '@rocket.chat/logger';
import { Meteor } from 'meteor/meteor';
import { Logger } from '../../../logger/server';
import { settings } from '../../../settings/server';
import { Info } from '../../../utils/rocketchat.info';

@ -1,9 +1,9 @@
import { InstanceStatus } from '@rocket.chat/instance-status';
import { Logger } from '@rocket.chat/logger';
import { Meteor } from 'meteor/meteor';
import { WebApp } from 'meteor/webapp';
import _ from 'underscore';
import { Logger } from '../../../../server/lib/logger/Logger';
import { getMethodArgs } from '../../../../server/lib/logger/logPayloads';
import { metrics } from '../../../metrics/server';
import { settings } from '../../../settings/server';

@ -1,7 +1,7 @@
import { Logger } from '@rocket.chat/logger';
import type { Response } from 'meteor/rocketchat:restivus';
import semver from 'semver';
import { Logger } from '../../../logger/server';
import { metrics } from '../../../metrics/server';
const deprecationLogger = new Logger('DeprecationWarning');

@ -1,8 +1,8 @@
import { Logger } from '@rocket.chat/logger';
import { ServiceConfiguration } from 'meteor/service-configuration';
import _ from 'underscore';
import { CustomOAuth } from '../../../custom-oauth/server/custom_oauth_server';
import { Logger } from '../../../logger/server';
import { settings } from '../../../settings/server';
import { addOAuthService } from '../functions/addOAuthService';

@ -1,10 +1,10 @@
import { Logger } from '@rocket.chat/logger';
import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
import { Meteor } from 'meteor/meteor';
import { RateLimiter } from 'meteor/rate-limit';
import _ from 'underscore';
import { sleep } from '../../../../lib/utils/sleep';
import { Logger } from '../../../logger/server';
import { metrics } from '../../../metrics/server';
import { settings } from '../../../settings/server';

@ -1,10 +1,10 @@
import { Logger } from '@rocket.chat/logger';
import { LivechatRooms } from '@rocket.chat/models';
import moment from 'moment-timezone';
import { callbacks } from '../../../../lib/callbacks';
import { secondsToHHMMSS } from '../../../../lib/utils/secondsToHHMMSS';
import { i18n } from '../../../../server/lib/i18n';
import { Logger } from '../../../logger/server';
import { getTimezone } from '../../../utils/server/lib/getTimezone';
const HOURS_IN_DAY = 24;

@ -1,7 +1,7 @@
import { Logger } from '@rocket.chat/logger';
import { LivechatDepartment, LivechatDepartmentAgents, LivechatRooms } from '@rocket.chat/models';
import { callbacks } from '../../../../lib/callbacks';
import { Logger } from '../../../logger/server';
class DepartmentHelperClass {
logger = new Logger('Omnichannel:DepartmentHelper');

@ -15,6 +15,7 @@ import type {
} from '@rocket.chat/core-typings';
import { LivechatInquiryStatus, OmnichannelSourceType, DEFAULT_SLA_CONFIG, UserStatus } from '@rocket.chat/core-typings';
import { LivechatPriorityWeight } from '@rocket.chat/core-typings/src/ILivechatPriority';
import { Logger } from '@rocket.chat/logger';
import type { InsertionModel } from '@rocket.chat/model-typings';
import {
LivechatDepartmentAgents,
@ -35,7 +36,6 @@ import { i18n } from '../../../../server/lib/i18n';
import { hasRoleAsync } from '../../../authorization/server/functions/hasRole';
import { sendNotification } from '../../../lib/server';
import { sendMessage } from '../../../lib/server/functions/sendMessage';
import { Logger } from '../../../logger/server';
import { settings } from '../../../settings/server';
import { Livechat } from './Livechat';
import { Livechat as LivechatTyped } from './LivechatTyped';

@ -5,6 +5,7 @@ import dns from 'dns';
import util from 'util';
import { Message, VideoConf, api } from '@rocket.chat/core-services';
import { Logger } from '@rocket.chat/logger';
import {
LivechatVisitors,
LivechatCustomField,
@ -34,7 +35,6 @@ import { FileUpload } from '../../../file-upload/server';
import { deleteMessage } from '../../../lib/server/functions/deleteMessage';
import { sendMessage } from '../../../lib/server/functions/sendMessage';
import { updateMessage } from '../../../lib/server/functions/updateMessage';
import { Logger } from '../../../logger/server';
import * as Mailer from '../../../mailer/server/api';
import { settings } from '../../../settings/server';
import { businessHourManager } from '../business-hour';

@ -11,6 +11,7 @@ import type {
IMessage,
} from '@rocket.chat/core-typings';
import { UserStatus, isOmnichannelRoom } from '@rocket.chat/core-typings';
import { Logger, type MainLogger } from '@rocket.chat/logger';
import {
LivechatDepartment,
LivechatInquiry,
@ -29,10 +30,8 @@ import type { FindCursor, UpdateFilter } from 'mongodb';
import { Apps, AppEvents } from '../../../../ee/server/apps';
import { callbacks } from '../../../../lib/callbacks';
import { i18n } from '../../../../server/lib/i18n';
import type { MainLogger } from '../../../../server/lib/logger/getPino';
import { hasRoleAsync } from '../../../authorization/server/functions/hasRole';
import { sendMessage } from '../../../lib/server/functions/sendMessage';
import { Logger } from '../../../logger/server';
import * as Mailer from '../../../mailer/server/api';
import { metrics } from '../../../metrics/server';
import { settings } from '../../../settings/server';

@ -1,10 +1,10 @@
import type { ILivechatInquiryRecord, ILivechatVisitor, IMessage, IOmnichannelRoom, SelectedAgent } from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import { LivechatInquiry, LivechatRooms, Users } from '@rocket.chat/models';
import { Match, check } from 'meteor/check';
import { Meteor } from 'meteor/meteor';
import { callbacks } from '../../../../lib/callbacks';
import { Logger } from '../../../logger/server';
import { checkServiceStatus, createLivechatRoom, createLivechatInquiry } from './Helper';
import { RoutingManager } from './RoutingManager';

@ -10,13 +10,13 @@ import type {
InquiryWithAgentInfo,
TransferData,
} from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import { LivechatInquiry, LivechatRooms, Subscriptions, Rooms, Users } from '@rocket.chat/models';
import { Match, check } from 'meteor/check';
import { Meteor } from 'meteor/meteor';
import { Apps, AppEvents } from '../../../../ee/server/apps';
import { callbacks } from '../../../../lib/callbacks';
import { Logger } from '../../../../server/lib/logger/Logger';
import {
createLivechatSubscription,
dispatchAgentDelegated,

@ -1,4 +1,4 @@
import { Logger } from '../../../../server/lib/logger/Logger';
import { Logger } from '@rocket.chat/logger';
export const callbackLogger = new Logger('[Omnichannel] Callback');
export const businessHourLogger = new Logger('Business Hour');

@ -1,4 +1,5 @@
import { Logger } from '../../../../logger/server';
import { Logger } from '@rocket.chat/logger';
import { settings } from '../../../../settings/server';
import { Livechat } from '../Livechat';

@ -1,2 +0,0 @@
// TODO there are imports pointing to this file still, ideally we should point everything to "/server/lib/logger/Logger" and remove this file
export { Logger } from '../../../server/lib/logger/Logger';

@ -1,4 +1,4 @@
import { Logger } from '../../logger/server';
import { Logger } from '@rocket.chat/logger';
const logger = new Logger('MessageMarkAsUnread');
export default logger;

@ -1,8 +1,9 @@
import { EventEmitter } from 'events';
import zlib from 'zlib';
import type { Logger } from '@rocket.chat/logger';
import { ensureArray } from '../../../../lib/utils/arrayUtils';
import type { Logger } from '../../../../server/lib/logger/Logger';
import type { IUserDataMap, IAttributeMapping } from '../definition/IAttributeMapping';
import type { ISAMLGlobalSettings } from '../definition/ISAMLGlobalSettings';
import type { ISAMLUser } from '../definition/ISAMLUser';

@ -1,6 +1,6 @@
import { Logger } from '@rocket.chat/logger';
import { Meteor } from 'meteor/meteor';
import { Logger } from '../../logger/server';
import { settings } from '../../settings/server';
import { SAMLUtils } from './lib/Utils';
import { loadSamlServiceProviders, addSettings } from './lib/settings';

@ -3,6 +3,7 @@ import URL from 'url';
import type { OEmbedUrlContentResult, OEmbedUrlWithMetadata, IMessage, MessageAttachment, OEmbedMeta } from '@rocket.chat/core-typings';
import { isOEmbedUrlContentResult, isOEmbedUrlWithMetadata } from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import { Messages, OEmbedCache } from '@rocket.chat/models';
import { serverFetch as fetch } from '@rocket.chat/server-fetch';
import { camelCase } from 'change-case';
@ -14,7 +15,6 @@ import _ from 'underscore';
import { callbacks } from '../../../lib/callbacks';
import { isURL } from '../../../lib/utils/isURL';
import { Logger } from '../../logger/server';
import { settings } from '../../settings/server';
import { Info } from '../../utils/rocketchat.info';

@ -1,3 +1,3 @@
import { Logger } from '../../../server/lib/logger/Logger';
import { Logger } from '@rocket.chat/logger';
export const logger = new Logger('Push');

@ -1,3 +1,3 @@
import { Logger } from '../../../logger/server';
import { Logger } from '@rocket.chat/logger';
export const SearchLogger = new Logger('Search Logger');

@ -1,4 +1,4 @@
import { Logger } from '../../logger/server';
import { Logger } from '@rocket.chat/logger';
const logger = new Logger('SlackBridge');

@ -1,5 +1,6 @@
import type { ISession, ISessionDevice, ISocketConnectionLogged, IUser } from '@rocket.chat/core-typings';
import { cronJobs } from '@rocket.chat/cron';
import { Logger } from '@rocket.chat/logger';
import { Sessions, Users } from '@rocket.chat/models';
import mem from 'mem';
import { Meteor } from 'meteor/meteor';
@ -7,7 +8,6 @@ import UAParser from 'ua-parser-js';
import { getMostImportantRole } from '../../../../lib/roles/getMostImportantRole';
import { getClientAddress } from '../../../../server/lib/getClientAddress';
import { Logger } from '../../../../server/lib/logger/Logger';
import { aggregates } from '../../../../server/models/raw/Sessions';
import { sauEvents } from '../../../../server/services/sauMonitor/events';
import { UAParserMobile, UAParserDesktop } from './UAParserCustom';

@ -1,4 +1,4 @@
import { Logger } from '../../../server/lib/logger/Logger';
import { Logger } from '@rocket.chat/logger';
const logger = new Logger('TemplateVarHandler');

@ -1,3 +1,3 @@
import { Logger } from '../../logger/server';
import { Logger } from '@rocket.chat/logger';
export default new Logger('VersionCheck');

@ -1,9 +1,9 @@
import { MeteorError } from '@rocket.chat/core-services';
import type { IWebdavAccount } from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import type { ServerMethods, TranslationKey } from '@rocket.chat/ui-contexts';
import { Meteor } from 'meteor/meteor';
import { Logger } from '../../../logger/server';
import { settings } from '../../../settings/server';
import { uploadFileToWebdav } from '../lib/uploadFileToWebdav';

@ -1,12 +1,12 @@
import { Agenda } from '@rocket.chat/agenda';
import type { IUser } from '@rocket.chat/core-typings';
import type { MainLogger } from '@rocket.chat/logger';
import { LivechatRooms, Users } from '@rocket.chat/models';
import { Meteor } from 'meteor/meteor';
import { MongoInternals } from 'meteor/mongo';
import moment from 'moment';
import { Livechat } from '../../../../../app/livechat/server/lib/LivechatTyped';
import type { MainLogger } from '../../../../../server/lib/logger/getPino';
import { schedulerLogger } from './logger';
const SCHEDULER_NAME = 'omnichannel_auto_close_on_hold_scheduler';

@ -1,5 +1,6 @@
import { Agenda } from '@rocket.chat/agenda';
import type { IUser } from '@rocket.chat/core-typings';
import type { MainLogger } from '@rocket.chat/logger';
import { LivechatRooms, Users } from '@rocket.chat/models';
import { Meteor } from 'meteor/meteor';
import { MongoInternals } from 'meteor/mongo';
@ -8,7 +9,6 @@ import { Livechat } from '../../../../../app/livechat/server';
import { forwardRoomToAgent } from '../../../../../app/livechat/server/lib/Helper';
import { RoutingManager } from '../../../../../app/livechat/server/lib/RoutingManager';
import { settings } from '../../../../../app/settings/server';
import type { MainLogger } from '../../../../../server/lib/logger/getPino';
import { schedulerLogger } from './logger';
const SCHEDULER_NAME = 'omnichannel_scheduler';

@ -1,5 +1,6 @@
import { Agenda } from '@rocket.chat/agenda';
import type { IUser, IOmnichannelRoom } from '@rocket.chat/core-typings';
import type { MainLogger } from '@rocket.chat/logger';
import { LivechatRooms, LivechatInquiry as LivechatInquiryRaw, Users } from '@rocket.chat/models';
import { Meteor } from 'meteor/meteor';
import { MongoInternals } from 'meteor/mongo';
@ -8,7 +9,6 @@ import type { Db } from 'mongodb';
import { Livechat } from '../../../../../app/livechat/server/lib/LivechatTyped';
import { settings } from '../../../../../app/settings/server';
import { i18n } from '../../../../../server/lib/i18n';
import type { MainLogger } from '../../../../../server/lib/logger/getPino';
import { schedulerLogger } from './logger';
const SCHEDULER_NAME = 'omnichannel_queue_inactivity_monitor';

@ -1,13 +1,13 @@
import { OmnichannelEEService } from '@rocket.chat/core-services';
import type { ILivechatVisitor, IOmnichannelRoom, IUser } from '@rocket.chat/core-typings';
import { cronJobs } from '@rocket.chat/cron';
import type { MainLogger } from '@rocket.chat/logger';
import { LivechatVisitors, LivechatRooms, LivechatDepartment, Users } from '@rocket.chat/models';
import { Livechat } from '../../../../../app/livechat/server/lib/LivechatTyped';
import { settings } from '../../../../../app/settings/server';
import { callbacks } from '../../../../../lib/callbacks';
import { i18n } from '../../../../../server/lib/i18n';
import type { MainLogger } from '../../../../../server/lib/logger/getPino';
import { schedulerLogger } from './logger';
const isPromiseRejectedResult = (result: any): result is PromiseRejectedResult => result && result.status === 'rejected';

@ -1,4 +1,4 @@
import { Logger } from '../../../../../app/logger/server';
import { Logger } from '@rocket.chat/logger';
export const logger = new Logger('LivechatEnterprise');

@ -2,12 +2,12 @@ import { ServiceClassInternal, Message } from '@rocket.chat/core-services';
import type { IOmnichannelEEService } from '@rocket.chat/core-services';
import { isOmnichannelRoom } from '@rocket.chat/core-typings';
import type { IOmnichannelRoom, IUser, ILivechatInquiryRecord, IOmnichannelSystemMessage } from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import { LivechatRooms, Subscriptions, LivechatInquiry } from '@rocket.chat/models';
import { dispatchAgentDelegated } from '../../../../../app/livechat/server/lib/Helper';
import { queueInquiry } from '../../../../../app/livechat/server/lib/QueueManager';
import { RoutingManager } from '../../../../../app/livechat/server/lib/RoutingManager';
import { Logger } from '../../../../../app/logger/server';
import { callbacks } from '../../../../../lib/callbacks';
export class OmnichannelEE extends ServiceClassInternal implements IOmnichannelEEService {

@ -1,7 +1,7 @@
import { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus';
import type { IMarketplaceInfo } from '@rocket.chat/apps-engine/server/marketplace';
import type { Logger } from '@rocket.chat/logger';
import type { Logger } from '../../../../server/lib/logger/Logger';
import { getMarketplaceAppInfo } from './appInfo';
export const appEnableCheck = async ({

@ -1,6 +1,7 @@
import { EssentialAppDisabledException } from '@rocket.chat/apps-engine/definition/exceptions';
import { AppInterface } from '@rocket.chat/apps-engine/definition/metadata';
import { AppManager } from '@rocket.chat/apps-engine/server/AppManager';
import { Logger } from '@rocket.chat/logger';
import { AppLogs, Apps as AppsModel, AppsPersistence } from '@rocket.chat/models';
import { Meteor } from 'meteor/meteor';
@ -17,7 +18,6 @@ import {
} from '../../../app/apps/server/converters';
import { AppThreadsConverter } from '../../../app/apps/server/converters/threads';
import { settings, settingsRegistry } from '../../../app/settings/server';
import { Logger } from '../../../server/lib/logger/Logger';
import { canEnableApp } from '../../app/license/server/license';
import { AppServerNotifier, AppsRestApi, AppUIKitInteractionApi } from './communication';
import { AppRealLogsStorage, AppRealStorage, ConfigurableAppSourceStorage } from './storage';

@ -1,8 +1,8 @@
import type { IUser } from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import { Roles } from '@rocket.chat/models';
import { capitalize } from '@rocket.chat/string-helpers';
import { Logger } from '../../../app/logger/server';
import { settings } from '../../../app/settings/server';
import { callbacks } from '../../../lib/callbacks';
import { onLicense } from '../../app/license/server';

@ -1,7 +1,7 @@
import type { IImportUser, ILDAPEntry } from '@rocket.chat/core-typings';
import type { Logger } from '@rocket.chat/logger';
import { expect, spy } from 'chai';
import type { Logger } from '../../../../app/logger/server';
import { copyCustomFieldsLDAP } from './copyCustomFieldsLDAP';
describe('LDAP copyCustomFieldsLDAP', () => {

@ -1,6 +1,6 @@
import type { IImportUser, ILDAPEntry } from '@rocket.chat/core-typings';
import type { Logger } from '@rocket.chat/logger';
import type { Logger } from '../../../../app/logger/server';
import { templateVarHandler } from '../../../../app/utils/lib/templateVarHandler';
import { getNestedProp } from './getNestedProp';
import { replacesNestedValues } from './replacesNestedValues';

@ -1,9 +1,9 @@
import type { IUser } from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import { Roles, Rooms } from '@rocket.chat/models';
import { addUserToRoom } from '../../../../app/lib/server/functions/addUserToRoom';
import { createRoom } from '../../../../app/lib/server/functions/createRoom';
import { Logger } from '../../../../app/logger/server';
import { getValidRoomName } from '../../../../app/utils/server/lib/getValidRoomName';
import { syncUserRoles } from '../syncUserRoles';

@ -43,7 +43,7 @@
"moleculer": "^0.14.29",
"mongodb": "^4.12.1",
"nats": "^2.6.1",
"pino": "^7.11.0",
"pino": "^8.15.0",
"sodium-native": "^3.3.0",
"sodium-plus": "^0.9.0",
"uuid": "^8.3.2",

@ -1,6 +1,6 @@
import type { Logger } from '@rocket.chat/logger';
import { Random } from '@rocket.chat/random';
import type { Logger } from '../../app/logger/server';
import { compareByRanking } from '../utils/comparisons';
enum CallbackPriority {

@ -248,6 +248,7 @@
"@rocket.chat/instance-status": "workspace:^",
"@rocket.chat/layout": "next",
"@rocket.chat/log-format": "workspace:^",
"@rocket.chat/logger": "workspace:^",
"@rocket.chat/logo": "next",
"@rocket.chat/memo": "next",
"@rocket.chat/message-parser": "next",
@ -384,7 +385,7 @@
"path-to-regexp": "^6.2.1",
"pdfjs-dist": "^2.13.216",
"photoswipe": "^4.1.3",
"pino": "^7.11.0",
"pino": "^8.15.0",
"postis": "^2.2.0",
"prom-client": "^14.0.1",
"prometheus-gc-stats": "^0.6.4",

@ -1,11 +1,11 @@
import { cronJobs } from '@rocket.chat/cron';
import type { Logger } from '@rocket.chat/logger';
import { serverFetch as fetch } from '@rocket.chat/server-fetch';
import { Meteor } from 'meteor/meteor';
import { getWorkspaceAccessToken } from '../../app/cloud/server';
import { settings } from '../../app/settings/server';
import { statistics } from '../../app/statistics/server';
import type { Logger } from '../lib/logger/Logger';
async function generateStatistics(logger: Logger): Promise<void> {
const cronStatistics: Record<string, any> = await statistics.save();

@ -1,11 +1,11 @@
import EventEmitter from 'events';
import type { IRocketChatRecord } from '@rocket.chat/core-typings';
import type { Logger } from '@rocket.chat/logger';
import { escapeRegExp } from '@rocket.chat/string-helpers';
import type { Timestamp, Db, ChangeStreamDeleteDocument, ChangeStreamInsertDocument, ChangeStreamUpdateDocument } from 'mongodb';
import { MongoClient } from 'mongodb';
import type { Logger } from '../lib/logger/Logger';
import { convertChangeStreamPayload } from './convertChangeStreamPayload';
import { convertOplogPayload } from './convertOplogPayload';
import { getWatchCollections } from './watchCollections';

@ -1,3 +1,3 @@
import { Logger } from '../../lib/logger/Logger';
import { Logger } from '@rocket.chat/logger';
export const logger = new Logger('EmailInbox');

@ -35,7 +35,6 @@ import '../app/importer-slack-users/server';
import '../app/integrations/server';
import '../app/irc/server';
import '../app/lib/server';
import '../app/logger/server';
import '../app/token-login/server';
import '../app/mailer/server/api';
import '../app/markdown/server';

@ -1,10 +1,10 @@
import type { IImportUser, IUser } from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import { Users } from '@rocket.chat/models';
import type { IConverterOptions } from '../../../app/importer/server/classes/ImportDataConverter';
import { VirtualDataConverter } from '../../../app/importer/server/classes/VirtualDataConverter';
import { settings } from '../../../app/settings/server';
import { Logger } from '../logger/Logger';
const logger = new Logger('LDAP Data Converter');

@ -1,4 +1,4 @@
import { Logger } from '../logger/Logger';
import { Logger } from '@rocket.chat/logger';
export const logger = new Logger('LDAP');
export const connLogger = logger.section('Connection');

@ -1,7 +1,6 @@
import { setQueueLimit, logLevel, type LogLevelSetting } from '@rocket.chat/logger';
import { settings } from '../../../app/settings/server';
import type { LogLevelSetting } from './logLevel';
import { logLevel } from './logLevel';
import { setQueueLimit } from './logQueue';
settings.watch('Log_Level', (value) => {
if (value != null) {

@ -1,3 +1,3 @@
import { Logger } from './Logger';
import { Logger } from '@rocket.chat/logger';
export const SystemLogger = new Logger('System');

@ -1,9 +1,9 @@
import type { IControl } from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import { Migrations } from '@rocket.chat/models';
import { Info } from '../../app/utils/rocketchat.info';
import { sleep } from '../../lib/utils/sleep';
import { Logger } from './logger/Logger';
import { showErrorBox } from './logger/showBox';
type IMigration = {

@ -1,9 +1,8 @@
// Validates settings on DB are correct on structure
// And deletes invalid ones
import { Logger } from '@rocket.chat/logger';
import { Settings } from '@rocket.chat/models';
import { Logger } from './logger/Logger';
// Validates settings on DB are correct on structure by matching the ones missing all the required fields
const logger = new Logger('SettingsRegenerator');
export async function settingsRegenerator() {

@ -1,9 +1,9 @@
import { type IVoipRoomClosingInfo, type IVoipRoom, type RocketChatRecordDeleted, UserStatus } from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import type { FindPaginated, IVoipRoomModel } from '@rocket.chat/model-typings';
import { escapeRegExp } from '@rocket.chat/string-helpers';
import type { Collection, FindCursor, Db, Filter, FindOptions, UpdateResult, Document } from 'mongodb';
import { Logger } from '../../lib/logger/Logger';
import { BaseRaw } from './BaseRaw';
export class VoipRoomRaw extends BaseRaw<IVoipRoom> implements IVoipRoomModel {

@ -2,13 +2,13 @@ import type { ICalendarService } from '@rocket.chat/core-services';
import { ServiceClassInternal, api } from '@rocket.chat/core-services';
import type { IUser, ICalendarEvent } from '@rocket.chat/core-typings';
import { cronJobs } from '@rocket.chat/cron';
import { Logger } from '@rocket.chat/logger';
import type { InsertionModel } from '@rocket.chat/model-typings';
import { CalendarEvent } from '@rocket.chat/models';
import type { UpdateResult, DeleteResult } from 'mongodb';
import { settings } from '../../../app/settings/server';
import { getUserPreference } from '../../../app/utils/server/lib/getUserPreference';
import { Logger } from '../../lib/logger/Logger';
const logger = new Logger('Calendar');

@ -1,4 +1,4 @@
import { Logger } from '../../../../../lib/logger/Logger';
import { Logger } from '@rocket.chat/logger';
const logger = new Logger('Federation_Matrix');

@ -12,13 +12,13 @@ import type {
IVoipRoomClosingInfo,
} from '@rocket.chat/core-typings';
import { isILivechatVisitor, OmnichannelSourceType, isVoipRoom, VoipClientEvents, UserStatus } from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import { Users, VoipRoom, PbxEvents } from '@rocket.chat/models';
import type { PaginatedResult } from '@rocket.chat/rest-typings';
import type { FindOptions } from 'mongodb';
import _ from 'underscore';
import { sendMessage } from '../../../app/lib/server/functions/sendMessage';
import { Logger } from '../../lib/logger/Logger';
import type { IOmniRoomClosingMessage } from './internalTypes';
export class OmnichannelVoipService extends ServiceClassInternal implements IOmnichannelVoipService {

@ -1,10 +1,10 @@
import { api } from '@rocket.chat/core-services';
import { Logger } from '@rocket.chat/logger';
import { OmnichannelTranscript, QueueWorker } from '@rocket.chat/omnichannel-services';
import { MongoInternals } from 'meteor/mongo';
import { AuthorizationLivechat } from '../../app/livechat/server/roomAccessValidator.internalService';
import { isRunningMs } from '../lib/isRunningMs';
import { Logger } from '../lib/logger/Logger';
import { AnalyticsService } from './analytics/service';
import { AppsEngineService } from './apps-engine/service';
import { BannerService } from './banner/service';

@ -14,9 +14,9 @@
* added as and when required.
*/
import type { IVoipConnectorResult, IManagementServerConnectionStatus, IManagementConfigData } from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import type { Db } from 'mongodb';
import { Logger } from '../../../../lib/logger/Logger';
import { getManagementServerConfig } from '../../lib/Helper';
import { WebsocketConnection } from '../websocket/WebsocketConnection';
import type { Command } from './Command';

@ -3,9 +3,9 @@
* @remarks
*/
import type { IVoipConnectorResult } from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import type { Db } from 'mongodb';
import { Logger } from '../../../../../lib/logger/Logger';
import { Command, CommandType } from '../Command';
import { Commands } from '../Commands';
import { CallbackContext } from './CallbackContext';

@ -8,9 +8,9 @@
* happens in /etc/asterisk/manager.conf file.
*
*/
import { Logger } from '@rocket.chat/logger';
import Manager from 'asterisk-manager';
import { Logger } from '../../../../../lib/logger/Logger';
import type { Command } from '../Command';
import type { IConnection } from '../IConnection';
import type { CallbackContext } from './CallbackContext';

@ -6,9 +6,9 @@
* e.g even though extension_info and extension_list are two different commands,
* they will be executed by |PJSIPEndpoint| class.
*/
import { Logger } from '@rocket.chat/logger';
import type { Db } from 'mongodb';
import { Logger } from '../../../../../lib/logger/Logger';
import { Command } from '../Command';
import { Commands } from '../Commands';
import { ACDQueue } from './ACDQueue';

@ -43,10 +43,10 @@ import {
isIContactStatusEvent,
isICallHangupEvent,
} from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import { Users, PbxEvents } from '@rocket.chat/models';
import type { Db } from 'mongodb';
import { Logger } from '../../../../../lib/logger/Logger';
import { Command, CommandType } from '../Command';
import { Commands } from '../Commands';
import { ACDQueue } from './ACDQueue';

@ -30,10 +30,10 @@
*/
import { EndpointState } from '@rocket.chat/core-typings';
import type { IVoipConnectorResult, IExtensionDetails } from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import type { Db } from 'mongodb';
import _ from 'underscore';
import { Logger } from '../../../../../lib/logger/Logger';
import { Command, CommandType } from '../Command';
import { Commands } from '../Commands';
import { CallbackContext } from './CallbackContext';

@ -8,9 +8,9 @@
* Websocket configurations can be found in asterisk's http.conf and pjsip.conf
*
*/
import { Logger } from '@rocket.chat/logger';
import WebSocket from 'ws';
import { Logger } from '../../../../lib/logger/Logger';
import type { Command } from '../asterisk/Command';
import type { IConnection } from '../asterisk/IConnection';
import type { CallbackContext } from '../asterisk/ami/CallbackContext';

@ -12,10 +12,10 @@ import type {
IQueueMembershipSubscription,
IRegistrationInfo,
} from '@rocket.chat/core-typings';
import { Logger } from '@rocket.chat/logger';
import mem from 'mem';
import type { Db } from 'mongodb';
import { Logger } from '../../lib/logger/Logger';
import { CommandType } from './connector/asterisk/Command';
import { CommandHandler } from './connector/asterisk/CommandHandler';
import { Commands } from './connector/asterisk/Commands';

@ -1,8 +1,8 @@
import { Logger } from '@rocket.chat/logger';
import { performance } from 'universal-perf-hooks';
import { metrics, StatsTracker } from '../../app/metrics/server';
import { callbacks } from '../../lib/callbacks';
import { Logger } from '../lib/logger/Logger';
callbacks.setLogger(new Logger('Callbacks'));

@ -1,6 +1,6 @@
import { Logger } from '@rocket.chat/logger';
import { Meteor } from 'meteor/meteor';
import { Logger } from '../../app/logger/server';
import { federationCron } from '../cron/federation';
import { npsCron } from '../cron/nps';
import { oembedCron } from '../cron/oembed';

@ -1,10 +1,10 @@
import { api } from '@rocket.chat/core-services';
import { Logger } from '@rocket.chat/logger';
import { MongoInternals } from 'meteor/mongo';
import { metrics } from '../../app/metrics/server/lib/metrics';
import { DatabaseWatcher } from '../database/DatabaseWatcher';
import { db } from '../database/utils';
import { Logger } from '../lib/logger/Logger';
import { SystemLogger } from '../lib/logger/system';
import { initWatchers } from '../modules/watchers/watchers.module';

@ -1,10 +1,10 @@
import { performance } from 'perf_hooks';
import { format } from '@rocket.chat/log-format';
import { getQueuedLogs, logEntries } from '@rocket.chat/logger';
import EJSON from 'ejson';
import notifications from '../../app/notifications/server/lib/Notifications';
import { getQueuedLogs, logEntries } from '../lib/logger/logQueue';
const processString = (string: string, date: Date): string => {
try {

@ -33,7 +33,7 @@
"moleculer": "^0.14.29",
"mongodb": "^4.12.1",
"nats": "^2.4.0",
"pino": "^8.4.2",
"pino": "^8.15.0",
"polka": "^0.5.2",
"uuid": "^9.0.0"
},

@ -32,7 +32,7 @@
"moleculer": "^0.14.29",
"mongodb": "^4.12.1",
"nats": "^2.4.0",
"pino": "^8.4.2",
"pino": "^8.15.0",
"polka": "^0.5.2"
},
"devDependencies": {

@ -28,6 +28,9 @@ COPY ./packages/models/dist packages/models/dist
COPY ./packages/instance-status/package.json packages/instance-status/package.json
COPY ./packages/instance-status/dist packages/instance-status/dist
COPY ./packages/logger/package.json packages/logger/package.json
COPY ./packages/logger/dist packages/logger/dist
COPY ./ee/apps/${SERVICE}/dist .
COPY ./package.json .

@ -20,6 +20,7 @@
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "next",
"@rocket.chat/instance-status": "workspace:^",
"@rocket.chat/logger": "workspace:^",
"@rocket.chat/model-typings": "workspace:^",
"@rocket.chat/models": "workspace:^",
"@rocket.chat/rest-typings": "workspace:^",
@ -36,7 +37,7 @@
"moleculer": "^0.14.29",
"mongodb": "^4.12.1",
"nats": "^2.4.0",
"pino": "^7.11.0",
"pino": "^8.15.0",
"polka": "^0.5.2",
"sharp": "^0.30.7",
"underscore": "^1.13.6",

@ -1,11 +1,11 @@
import { EventEmitter } from 'events';
import { MeteorService, isMeteorError, MeteorError } from '@rocket.chat/core-services';
import { Logger } from '@rocket.chat/logger';
import ejson from 'ejson';
import { v1 as uuidv1 } from 'uuid';
import WebSocket from 'ws';
import { Logger } from '../../../../apps/meteor/server/lib/logger/Logger';
import type { Client } from './Client';
import { Publication } from './Publication';
import { DDP_EVENTS } from './constants';

@ -31,6 +31,9 @@ COPY ./ee/packages/pdf-worker/dist ee/packages/pdf-worker/dist
COPY ./packages/tools/package.json packages/tools/package.json
COPY ./packages/tools/dist packages/tools/dist
COPY ./packages/logger/package.json packages/logger/package.json
COPY ./packages/logger/dist packages/logger/dist
COPY ./ee/apps/${SERVICE}/dist .
COPY ./package.json .

@ -19,6 +19,7 @@
"@rocket.chat/core-services": "workspace:^",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "next",
"@rocket.chat/logger": "workspace:^",
"@rocket.chat/model-typings": "workspace:^",
"@rocket.chat/models": "workspace:^",
"@rocket.chat/omnichannel-services": "workspace:^",
@ -37,7 +38,7 @@
"mongo-message-queue": "^1.0.0",
"mongodb": "^4.12.1",
"nats": "^2.4.0",
"pino": "^8.4.2",
"pino": "^8.15.0",
"polka": "^0.5.2"
},
"devDependencies": {

@ -1,11 +1,11 @@
import { api } from '@rocket.chat/core-services';
import { Logger } from '@rocket.chat/logger';
import type { Document } from 'mongodb';
import polka from 'polka';
import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
import { Logger } from '../../../../apps/meteor/server/lib/logger/Logger';
const PORT = process.env.PORT || 3036;

@ -32,7 +32,7 @@
"moleculer": "^0.14.29",
"mongodb": "^4.12.1",
"nats": "^2.4.0",
"pino": "^8.4.2",
"pino": "^8.15.0",
"polka": "^0.5.2"
},
"devDependencies": {

@ -31,6 +31,9 @@ COPY ./ee/packages/pdf-worker/dist ee/packages/pdf-worker/dist
COPY ./packages/tools/package.json packages/tools/package.json
COPY ./packages/tools/dist packages/tools/dist
COPY ./packages/logger/package.json packages/logger/package.json
COPY ./packages/logger/dist packages/logger/dist
COPY ./ee/apps/${SERVICE}/dist .
COPY ./package.json .

@ -19,6 +19,7 @@
"@rocket.chat/core-services": "workspace:^",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "next",
"@rocket.chat/logger": "workspace:^",
"@rocket.chat/model-typings": "workspace:^",
"@rocket.chat/models": "workspace:^",
"@rocket.chat/omnichannel-services": "workspace:^",
@ -35,7 +36,7 @@
"mongo-message-queue": "^1.0.0",
"mongodb": "^4.12.1",
"nats": "^2.4.0",
"pino": "^8.4.2",
"pino": "^8.15.0",
"polka": "^0.5.2"
},
"devDependencies": {

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save