refactor logger export

Signed-off-by: Raccoon <raccoon@hackmd.io>

lib/app.ts

@@ -20,7 +20,7 @@ import SocketIo from 'socket.io'
 import {Server as WsServer} from 'ws'
 // core
 import * as config from "./config";
-import * as logger from "./logger";
+import {logger} from "./logger";
 import * as response from "./response";
 import * as models from "./models";
 import * as csp from "./csp";

lib/auth/email/index.ts

@@ -5,7 +5,7 @@ import {Strategy as LocalStrategy} from 'passport-local';
 
 import * as config from '../../config';
 import * as models from '../../models';
-import * as logger from "../../logger";
+import {logger} from "../../logger";
 import {setReturnToFromReferer} from "../utils";
 import {urlencodedParser} from "../../utils";
 import * as response from "../../response";

lib/auth/index.ts

@@ -2,7 +2,7 @@ import {Router} from "express";
 
 import passport from "passport";
 import * as config from "../config";
-import * as logger from "../logger";
+import {logger} from "../logger";
 import * as models from "../models";
 
 const authRouter = Router()

lib/auth/ldap/index.ts

@@ -4,7 +4,7 @@ import LDAPStrategy from "passport-ldapauth";
 
 import * as config from "../../config";
 import * as models from "../../models";
-import * as logger from "../../logger";
+import {logger} from "../../logger";
 import * as response from "../../response";
 import {setReturnToFromReferer} from "../utils";
 import {urlencodedParser} from "../../utils";

lib/auth/openid/index.ts

@@ -4,7 +4,7 @@ import {Strategy as OpenIDStrategy} from "@passport-next/passport-openid";
 
 import * as config from "../../config";
 import * as models from "../../models";
-import * as logger from "../../logger";
+import {logger} from "../../logger";
 import {urlencodedParser} from "../../utils";
 import {setReturnToFromReferer} from "../utils";
 

lib/auth/saml/index.ts

@@ -5,7 +5,7 @@ import {Strategy as SamlStrategy} from "passport-saml";
 
 import * as config from "../../config";
 import * as models from "../../models";
-import * as logger from "../../logger";
+import {logger} from "../../logger";
 import {urlencodedParser} from "../../utils";
 
 const intersection = function (array1, array2) {

lib/auth/utils.ts

@@ -2,7 +2,7 @@
 
 import * as models from "../models";
 import * as config from "../config";
-import * as logger from "../logger";
+import {logger} from "../logger";
 
 export function setReturnToFromReferer(req) {
   if (!req.session) req.session = {}

lib/config/index.ts

@@ -5,7 +5,7 @@ import {merge} from "lodash";
 import deepFreeze from "deep-freeze";
 
 import {Environment, Permission} from "./enum";
-import * as logger from "../logger";
+import {logger} from "../logger";
 import {getGitCommit, getGitHubURL} from "./utils";
 
 const appRootPath = path.resolve(__dirname, '../../')

lib/history/index.ts

@@ -3,7 +3,7 @@
 import LZString from '@hackmd/lz-string'
 
 import * as models from '../models'
-import * as logger from '../logger'
+import {logger} from '../logger'
 import * as config from '../config'
 import * as response from '../response'
 

lib/homepage/index.ts

@@ -4,7 +4,7 @@ import * as config from '../config'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import {User} from '../models'
-import * as logger from '../logger'
+import {logger} from '../logger'
 import {Request, Response} from "express";
 
 

lib/imageRouter/azure.ts

@@ -4,7 +4,7 @@ import * as path from "path";
 import azure from "azure-storage";
 
 import * as config from "../config";
-import * as logger from "../logger";
+import {logger} from "../logger";
 
 export function uploadImage(imagePath, callback) {
   if (!imagePath || typeof imagePath !== 'string') {

lib/imageRouter/filesystem.ts

@@ -6,7 +6,7 @@ import * as crypto from "crypto";
 import {URL} from "url";
 
 import * as config from "../config";
-import * as logger from "../logger";
+import {logger} from "../logger";
 
 /**
  * generate a random filename for uploaded image

lib/imageRouter/imgur.ts

@@ -2,7 +2,7 @@
 import imgur from "@hackmd/imgur";
 
 import * as config from "../config";
-import * as logger from "../logger";
+import {logger} from "../logger";
 
 export function uploadImage(imagePath, callback) {
   if (!imagePath || typeof imagePath !== 'string') {

lib/imageRouter/index.ts

@@ -9,7 +9,7 @@ import imageType from "image-type";
 import mime from "mime-types";
 
 import * as config from "../config";
-import * as logger from "../logger";
+import {logger} from "../logger";
 import * as response from "../response";
 
 const imageRouter = Router()

lib/imageRouter/lutim.ts

@@ -1,7 +1,7 @@
 import lutim from "lutim";
 
 import * as  config from "../config";
-import * as logger from "../logger";
+import {logger} from "../logger";
 
 
 export function uploadImage(imagePath, callback) {

lib/imageRouter/minio.ts

@@ -5,7 +5,7 @@ import Minio from "minio";
 
 import * as config from "../config";
 import {getImageMimeType} from "../utils";
-import * as logger from "../logger";
+import {logger} from "../logger";
 
 const minioClient = new Minio.Client({
   endPoint: config.minio.endPoint,

lib/imageRouter/s3.ts

@@ -6,7 +6,7 @@ import {PutObjectCommand, PutObjectInput} from "@aws-sdk/client-s3-node/commands
 
 import * as config from "../config";
 import {getImageMimeType} from "../utils";
-import * as logger from "../logger";
+import {logger} from "../logger";
 
 
 const credentials = {

lib/logger.ts

@@ -1,3 +1,4 @@
+// Do not require any relative module in this file, will caused circular dependencies.
 import {createLogger, format, transports, Logger} from "winston";
 
 
@@ -25,7 +26,7 @@ if (process.env.NODE_ENV === 'development' || !process.env.NODE_ENV) {
   )
 }
 
-const logger: CodiMDLogger = createLogger({
+export const logger: CodiMDLogger = createLogger({
   format: defaultFormatter,
   transports: [
     new transports.Console({
@@ -46,4 +47,4 @@ logger.setLevel = function (level) {
   logger.level = level
 }
 
-export = logger
+export default logger

lib/middleware/checkURIValid.ts

@@ -1,4 +1,4 @@
-import * as logger from '../logger'
+import {logger} from '../logger'
 import * as response from "../response";
 
 export default function (req, res, next) {

lib/models/index.ts

@@ -6,7 +6,7 @@ import {cloneDeep} from "lodash";
 
 // core
 import * as config from "../config";
-import * as logger from "../logger";
+import {logger} from "../logger";
 
 const dbconfig = cloneDeep(config.db)
 dbconfig.logging = config.debug ? (data) => {

lib/models/note.ts

@@ -14,7 +14,7 @@ import DiffMatchPatch from "@hackmd/diff-match-patch";
 
 // core
 import * as config from "../config";
-import * as logger from "../logger";
+import {logger} from "../logger";
 import {stripTags} from "../string";
 
 // ot

lib/models/revision.ts

@@ -9,7 +9,7 @@ import * as  util from "util";
 
 // core
 import * as config from "../config";
-import * as logger from "../logger";
+import {logger} from "../logger";
 
 const Op = Sequelize.Op
 

lib/models/user.ts

@@ -4,7 +4,7 @@ import * as Sequelize from "sequelize";
 
 import Scrypt from "scrypt-kdf";
 // core
-import * as logger from "../logger";
+import {logger} from "../logger";
 import {generateAvatarURL} from "../letter-avatars";
 
 export = function (sequelize, DataTypes) {

lib/note/index.ts

@@ -1,5 +1,5 @@
 import * as config from "../config";
-import * as logger from "../logger";
+import {logger} from "../logger";
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore

lib/note/noteActions.ts

@@ -8,7 +8,7 @@ import moment from "moment";
 // const { Pandoc } = require('@hackmd/pandoc.js')
 
 import * as config from "../config";
-import * as logger from "../logger";
+import {logger} from "../logger";
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import {Note, Revision} from "../models";

lib/realtime/realtime.ts

@@ -10,7 +10,7 @@ import {get} from "lodash";
 
 // core
 import * as config from "../config";
-import * as logger from "../logger";
+import {logger} from "../logger";
 import * as history from "../history";
 import * as models from "../models";
 

lib/realtime/realtimeCleanDanglingUserJob.ts

@@ -3,7 +3,7 @@
 import async from "async";
 
 import * as config from "../config";
-import * as logger from "../logger";
+import {logger} from "../logger";
 
 /**
  * clean when user not in any rooms or user not in connected list

lib/realtime/realtimeClientConnection.ts

@@ -4,7 +4,7 @@ import {get} from "lodash";
 
 import * as config from "../config";
 import * as models from "../models";
-import * as logger from "../logger";
+import {logger} from "../logger";
 
 export class RealtimeClientConnection {
   private socket: any;

lib/realtime/realtimeSaveRevisionJob.ts

@@ -1,7 +1,7 @@
 'use strict'
 
 import * as models from "../models";
-import * as logger from "../logger";
+import {logger} from "../logger";
 
 /**
  * clean when user not in any rooms or user not in connected list

lib/realtime/realtimeUpdateDirtyNoteJob.ts

@@ -1,7 +1,7 @@
 import moment from "moment";
 
 import * as config from "../config";
-import * as logger from "../logger";
+import {logger} from "../logger";
 
 export class UpdateDirtyNoteJob {
   private realtime: any;

lib/response.ts

@@ -3,7 +3,7 @@
 import * as request from "request";
 // core
 import * as config from "./config";
-import * as logger from "./logger";
+import {logger} from "./logger";
 import * as models from "./models";
 import * as utils from "./utils";
 import * as  history from "./history";

lib/user/index.ts

@@ -3,7 +3,7 @@ import async from 'async'
 import * as response from '../response'
 import * as config from '../config'
 import * as models from '../models'
-import * as logger from '../logger'
+import {logger} from '../logger'
 import { generateAvatar } from '../letter-avatars'
 
 export async function getMe (req, res) {

lib/web/middleware/checkVersion.ts

@@ -2,7 +2,7 @@ import {promisify} from "util";
 
 import request from "request";
 
-import * as logger from "../../logger";
+import {logger} from "../../logger";
 import * as config from "../../config";
 
 let lastCheckAt

lib/workers/dmpWorker.ts

@@ -3,7 +3,7 @@
 import DiffMatchPatch from "@hackmd/diff-match-patch";
 // core
 import * as config from "../config";
-import * as logger from "../logger";
+import {logger} from "../logger";
 
 const dmp = new DiffMatchPatch()
 process.on('message', function (data) {