feat: rename debug scope

.env.example

@@ -30,4 +30,4 @@ MELI_GITHUB_CLIENT_ID=xxxx
 MELI_GITHUB_CLIENT_SECRET=xxxx
 MELI_GITHUB_ORGS=my-org
 
-DEBUG=meli.server:handleError
+DEBUG=meli.api:handleError

src/auth/authenticate.ts

@@ -1,16 +1,12 @@
-import {
-  NextFunction, Request, Response,
-} from 'express';
+import { NextFunction, Request, Response } from 'express';
 import { createOrUpdateUser, PassportUser } from './create-or-update-user';
 import { env } from '../env';
-import {
-  authCookieName, cookieOptions, JwtToken,
-} from './auth';
+import { authCookieName, cookieOptions, JwtToken } from './auth';
 import jwt from 'jsonwebtoken';
 import { Logger } from '../commons/logger/logger';
 import { wrapAsyncMiddleware } from '../commons/utils/wrap-async-middleware';
 
-const logger = new Logger('meli.server:authenticate');
+const logger = new Logger('meli.api:authenticate');
 
 async function handler(req: Request, res: Response, next: NextFunction) {
   const passportUser = req.user as PassportUser;

src/auth/create-or-update-user.ts

@@ -3,7 +3,7 @@ import { Logger } from '../commons/logger/logger';
 import { uuid } from '../utils/uuid';
 import { Members } from '../entities/members/member';
 
-const logger = new Logger('meli.server:createOrUpdateUser');
+const logger = new Logger('meli.api:createOrUpdateUser');
 
 export interface PassportUser {
   authProvider: string;

src/auth/handlers/authorize-api-req.ts

@@ -1,12 +1,10 @@
-import {
-  NextFunction, Request, Response,
-} from 'express';
+import { NextFunction, Request, Response } from 'express';
 import { Logger } from '../../commons/logger/logger';
 import { wrapAsyncMiddleware } from '../../commons/utils/wrap-async-middleware';
 import { Users } from '../../entities/users/user';
 import { ApiTokens } from '../../entities/api/api-token';
 
-const logger = new Logger('meli.server:authorizeApiReq');
+const logger = new Logger('meli.api:authorizeApiReq');
 
 async function handler(req: Request, res: Response, next: NextFunction) {
   if (req.user) {

src/auth/handlers/authorize-req.ts

@@ -1,13 +1,11 @@
-import {
-  NextFunction, Request, Response,
-} from 'express';
+import { NextFunction, Request, Response } from 'express';
 import { authCookieName, cookieOptions } from '../auth';
 import { Logger } from '../../commons/logger/logger';
 import { verifyToken } from '../utils/verify-token';
 import { wrapAsyncMiddleware } from '../../commons/utils/wrap-async-middleware';
 import { User } from '../../entities/users/user';
 
-const logger = new Logger('meli.server:authorizeReq');
+const logger = new Logger('meli.api:authorizeReq');
 
 async function handler(req: Request, res: Response, next: NextFunction) {
   const token = req.cookies[authCookieName];

src/auth/passport/gitea.ts

@@ -7,7 +7,7 @@ import OAuth2Strategy from 'passport-oauth2';
 import { Logger } from '../../commons/logger/logger';
 import { authMethods } from './auth-methods';
 
-const logger = new Logger('meli.server.passport:gitea');
+const logger = new Logger('meli.api.passport:gitea');
 
 export const gitea_redirect = '/auth/gitea';
 export const gitea_callback = '/auth/gitea/callback';

src/auth/passport/github.ts

@@ -7,7 +7,7 @@ import OAuth2Strategy from 'passport-oauth2';
 import { Logger } from '../../commons/logger/logger';
 import { authMethods } from './auth-methods';
 
-const logger = new Logger('meli.server.passport:github');
+const logger = new Logger('meli.api.passport:github');
 
 export const github_redirect = '/auth/github';
 export const github_callback = '/auth/github/callback';

src/auth/passport/gitlab.ts

@@ -8,7 +8,7 @@ import { Logger } from '../../commons/logger/logger';
 import OAuth2Strategy from 'passport-oauth2';
 import { authMethods } from './auth-methods';
 
-const logger = new Logger('meli.server.passport:gitlab');
+const logger = new Logger('meli.api.passport:gitlab');
 
 export const gitlab_redirect = '/auth/gitlab';
 export const gitlab_callback = '/auth/gitlab/callback';

src/auth/passport/google.ts

@@ -6,7 +6,7 @@ import GoogleStrategy from 'passport-google-oauth20';
 import { Logger } from '../../commons/logger/logger';
 import { authMethods } from './auth-methods';
 
-const logger = new Logger('meli.server.passport:google');
+const logger = new Logger('meli.api.passport:google');
 
 export const google_redirect = '/auth/google';
 export const google_callback = '/auth/google/callback';

src/caddy/configuration.ts

@@ -5,7 +5,7 @@ import { Site } from '../entities/sites/site';
 import { Branch } from '../entities/sites/branch';
 import { generateConfig } from './generate-config';
 
-const logger = new Logger('meli.server:caddy');
+const logger = new Logger('meli.api:caddy');
 
 export async function configureCaddy(): Promise<void> {
   logger.debug('Configuring Caddy...');

src/commons/allowed-hosts.ts

@@ -4,7 +4,7 @@ import { Logger } from './logger/logger';
 import { promises } from 'dns';
 import { cidrSubnet } from 'ip';
 
-const logger = new Logger('meli.server:allowedHosts');
+const logger = new Logger('meli.api:allowedHosts');
 
 function ipMatch(ip: string, ranges: string[]) {
   return ranges

src/commons/env/parse-env.ts

@@ -2,7 +2,7 @@ import { object, Schema } from 'joi';
 import { JOI_OPTIONS } from '../../constants';
 import { Logger } from '../logger/logger';
 
-const logger = new Logger('meli.server:env.parse');
+const logger = new Logger('meli.api:env.parse');
 
 export interface EnvVarSpec {
   transform?: (val: any) => any;

src/commons/utils/handle-error.ts

@@ -1,13 +1,11 @@
-import {
-  NextFunction, Request, Response,
-} from 'express';
+import { NextFunction, Request, Response } from 'express';
 import { AxiosError } from 'axios';
 import { Logger } from '../logger/logger';
 import { HttpError } from '../errors/http-error';
 import { ValidationError } from 'joi';
 import { AppError } from '../errors/app-error';
 
-const logger = new Logger('meli.server:handleError');
+const logger = new Logger('meli.api:handleError');
 
 export function handleError(err: any, req: Request, res: Response, next: NextFunction): void {
   logger.debug(err);

src/db/indexes/create-indexes-for-collection.ts

@@ -1,12 +1,10 @@
-import {
-  Collection, IndexSpecification, MongoError,
-} from 'mongodb';
+import { Collection, IndexSpecification, MongoError } from 'mongodb';
 import chalk from 'chalk';
 import { FieldOrSpec, MongoIndexSpec } from './configure-indexes';
 import { MongoErrorCode } from './mongo-error-code';
 import { Logger } from '../../commons/logger/logger';
 
-const logger = new Logger('meli.server:db.indexes.configure');
+const logger = new Logger('meli.api:db.indexes.configure');
 
 function findIndexWithSameKey(existingIndexes: IndexSpecification[], fieldOrSpec: FieldOrSpec) {
   const fields = typeof fieldOrSpec === 'string' ? [fieldOrSpec] : Object.keys(fieldOrSpec);

src/db/migrate/migrate.ts

@@ -4,7 +4,7 @@ import { rollForward } from './roll-forward';
 import { Logger } from '../../commons/logger/logger';
 import { env } from '../../env';
 
-const logger = new Logger('meli.server:migrate.migrate');
+const logger = new Logger('meli.api:migrate.migrate');
 
 // https://github.com/seppevs/migrate-mongo#api-usage
 export async function migrate(client: MongoClient, db: Db): Promise<void> {

src/db/migrate/roll-backwards.ts

@@ -3,7 +3,7 @@ import chalk from 'chalk';
 import { down } from 'migrate-mongo';
 import { Logger } from '../../commons/logger/logger';
 
-const logger = new Logger('meli.server:migrate.rollBackwards');
+const logger = new Logger('meli.api:migrate.rollBackwards');
 
 export async function rollBackwards(db: Db, client: MongoClient): Promise<void> {
   logger.debug('Rolling back');

src/db/migrate/roll-forward.ts

@@ -3,7 +3,7 @@ import chalk from 'chalk';
 import { up } from 'migrate-mongo';
 import { Logger } from '../../commons/logger/logger';
 
-const logger = new Logger('meli.server:migrate.rollForward');
+const logger = new Logger('meli.api:migrate.rollForward');
 
 export async function rollForward(db: Db, client: MongoClient): Promise<void> {
   logger.debug('Rolling forward');

src/emails/emails.ts

@@ -4,7 +4,7 @@ import Mail from 'nodemailer/lib/mailer';
 import { Logger } from '../commons/logger/logger';
 import chalk from 'chalk';
 
-const logger = new Logger('meli.server:emails');
+const logger = new Logger('meli.api:emails');
 
 let transporter: {
   sendMail(mailOptions: Mail.Options): Promise<SentMessageInfo>;

src/emails/send-email.ts

@@ -6,7 +6,7 @@ import { compile, TemplateDelegate } from 'handlebars';
 import { env } from '../env';
 import { Logger } from '../commons/logger/logger';
 
-const logger = new Logger('meli.server:sendEmailTemplate');
+const logger = new Logger('meli.api:sendEmailTemplate');
 
 export async function sendEmail(
   to: string[],

src/entities/releases/handlers/delete-release.ts

@@ -18,7 +18,7 @@ const validators = [
   })),
 ];
 
-const logger = new Logger('meli.server:deleteRelease');
+const logger = new Logger('meli.api:deleteRelease');
 
 async function handler(req: Request, res: Response): Promise<void> {
   const { releaseId } = req.params;

src/entities/sites/link-branch-to-release.ts

@@ -1,14 +1,12 @@
 import { Site } from './site';
 import { Branch } from './branch';
 import { Release } from '../releases/release';
-import {
-  getBranchDir, getBranchStaticDir, getReleaseDir,
-} from './get-site-dir';
+import { getBranchDir, getBranchStaticDir, getReleaseDir } from './get-site-dir';
 import { promises as fs } from 'fs';
 import { dirname, relative } from 'path';
 import { Logger } from '../../commons/logger/logger';
 
-const logger = new Logger('meli.server:linkBranchToRelease');
+const logger = new Logger('meli.api:linkBranchToRelease');
 
 export async function linkBranchToRelease(site: Site, branch: Branch, release: Release): Promise<void> {
   const releasePath = getReleaseDir(release);

src/env.ts

@@ -1,13 +1,9 @@
 import chalk from 'chalk';
 import { cidrSubnet } from 'ip';
-import {
-  array, boolean, number, string,
-} from 'joi';
+import { array, boolean, number, string } from 'joi';
 import { tmpdir } from 'os';
 import { EnvSpec, parseEnv } from './commons/env/parse-env';
-import {
-  commaSeparatedStringToArray, stringToBoolean, stringToInt,
-} from './commons/env/transformers';
+import { commaSeparatedStringToArray, stringToBoolean, stringToInt } from './commons/env/transformers';
 import { AppError } from './commons/errors/app-error';
 import { isUrl } from './commons/validators/is-url';
 import { Logger } from './commons/logger/logger';
@@ -307,5 +303,5 @@ const envSpec: EnvSpec<Env> = {
 
 export const env: Env = parseEnv(envSpec);
 
-const logger = new Logger('meli.server:env');
+const logger = new Logger('meli.api:env');
 logger.debug('loaded env', env);

src/events/emit-event.ts

@@ -3,7 +3,7 @@ import { hookEventHandler } from '../hooks/hook-event-handler';
 import { socketEventHandler } from '../socket/socket-event-handler';
 import { AppEventData } from './app-event-data';
 
-const logger = new Logger('meli.server:emitEvent');
+const logger = new Logger('meli.api:emitEvent');
 
 export function emitEvent<T extends keyof AppEventData>(type: T, data: AppEventData[T]): void {
   logger.debug(type, data);

src/hooks/deliver-hook.ts

@@ -5,7 +5,7 @@ import { HookDeliveries, HookDelivery } from './hook-delivery';
 import { Hook } from './hook';
 import { AppEventData } from '../events/app-event-data';
 
-const logger = new Logger('meli.server:notify');
+const logger = new Logger('meli.api:notify');
 
 export async function deliverHook<EventType extends keyof AppEventData>(
   hook: Hook,

src/hooks/handlers/web/deliver-web-hook.ts

@@ -37,7 +37,7 @@ function signBody(payload: string, secret: string): string {
     .toString('hex');
 }
 
-const logger = new Logger('meli.server:deliverWebHook');
+const logger = new Logger('meli.api:deliverWebHook');
 
 export async function deliverWebHook(
   config: WebhookConfig,

src/hooks/hook-event-handler.ts

@@ -4,7 +4,7 @@ import { Logger } from '../commons/logger/logger';
 import { AppEventData } from '../events/app-event-data';
 import { getHooksForEvent } from './get-hooks-for-event';
 
-const logger = new Logger('meli.server:hookEventHandler');
+const logger = new Logger('meli.api:hookEventHandler');
 
 function deliverHooks<T extends keyof AppEventData>(hooks: Hook[], eventType: T, data: AppEventData[T]): void {
   hooks.forEach(hook => {

src/prometheus/setup-prometheus.ts

@@ -8,7 +8,7 @@ import { Application } from 'express';
 import { up } from './metrics/up';
 import { userCount } from './metrics/user-count';
 
-const logger = new Logger('meli.server:prometheus');
+const logger = new Logger('meli.api:prometheus');
 
 function registerCustomMetrics() {
   const updateMetrics = () => {

src/server.ts

@@ -25,7 +25,7 @@ import { authorizeReq } from './auth/handlers/authorize-req';
 import { authorizeApiReq } from './auth/handlers/authorize-api-req';
 import './socket/socket-rooms';
 
-const logger = new Logger('meli.server:server');
+const logger = new Logger('meli.api:server');
 
 logger.info(`Meli Server ${
   chalk.blue(BUILD_INFO.version)

src/socket/socket-event-handler.ts

@@ -1,6 +1,6 @@
 import { AppEventData } from '../events/app-event-data';
 
-// const logger = new Logger('meli.server:socketEventHandler');
+// const logger = new Logger('meli.api:socketEventHandler');
 
 export function socketEventHandler<T extends keyof AppEventData>(type: T, data: AppEventData[T]): void {
   // logger.debug('emit event', event, 'to room', room);

src/socket/socket-rooms.ts

@@ -13,7 +13,7 @@ import { orgSocketRoom } from '../entities/orgs/org';
 import { isOrgMember } from '../entities/orgs/guards/is-org-member';
 import { canAdminSite } from '../entities/sites/guards/can-admin-site';
 
-const logger = new Logger('meli.server:rooms');
+const logger = new Logger('meli.api:rooms');
 
 function joinRoom(
   socket: Socket,