Skip to content

Commit

Permalink
Reorganizing reuse of the logger from config.
Browse files Browse the repository at this point in the history
  • Loading branch information
Anna Bocharova committed Nov 19, 2023
1 parent 360f1c9 commit 265295f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 12 deletions.
12 changes: 7 additions & 5 deletions backend/src/config.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
import { createConfig } from "express-zod-api";
import { createConfig, createLogger } from "express-zod-api";
import fs from "fs";

export const frontendUrl = "https://www.incaseofmy.de/";
const sslDir = "/etc/letsencrypt/live/api.incaseofmy.de";

export const logger = createLogger({
level: "debug",
color: true,
});

export const config = createConfig({
server: {
listen: process.env.PORT || 6060,
Expand All @@ -22,10 +27,7 @@ export const config = createConfig({
listen: 443,
},
cors: true,
logger: {
level: "debug",
color: true,
},
logger,
});

export const github = {
Expand Down
5 changes: 1 addition & 4 deletions backend/src/disposer.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { Octokit } from "@octokit/core";
import { createLogger } from "express-zod-api";
import { app } from "./app";
import { AliveHook } from "./channel";
import { TelegramChannel } from "./channels/telegram";
import { config } from "./config";
import { logger } from "./config";
import { msInDay } from "./const";
import { UserDocument, Users } from "./db";
import { debounce } from "./debounce";
Expand All @@ -13,8 +12,6 @@ import { checkFreqToDays } from "./utils";
const runFreq = 10 * 60 * 1000; // interval between runs
const aliveHookThrottle = 60; // seconds

const logger = createLogger(config.logger);

const aliveHook = debounce({
fn: (async (user) => {
logger.info(`${user.id} is alive`);
Expand Down
5 changes: 2 additions & 3 deletions backend/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { createLogger, createServer } from "express-zod-api";
import { createServer } from "express-zod-api";
import { app } from "./app";
import { config } from "./config";
import { logger, config } from "./config";
import { connection, Users } from "./db";
import { routing } from "./routing";

(async () => {
const logger = createLogger(config.logger);
const db = await connection;
await Users.ensureIndexes();
logger.info(`Mongo ${db.version}`);
Expand Down

0 comments on commit 265295f

Please sign in to comment.