From b655fec99a0ccc60e239287d2a73e07aa1a24b0e Mon Sep 17 00:00:00 2001 From: Jonathan Barrow Date: Tue, 28 Feb 2023 20:25:27 -0500 Subject: [PATCH] Move logger to src folder --- src/config-manager.js | 2 +- src/database.js | 2 +- logger.js => src/logger.js | 0 src/server.js | 2 +- src/services/api/index.js | 2 +- src/services/api/routes/v1/register.js | 2 +- src/services/assets/index.js | 2 +- src/services/conntest/index.js | 2 +- src/services/datastore/index.js | 2 +- src/services/local-cdn/index.js | 2 +- src/services/nasc/index.js | 2 +- src/services/nnid/index.js | 2 +- src/services/nnid/routes/people.js | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) rename logger.js => src/logger.js (100%) diff --git a/src/config-manager.js b/src/config-manager.js index 6376355..954f2a4 100644 --- a/src/config-manager.js +++ b/src/config-manager.js @@ -1,7 +1,7 @@ const fs = require('fs-extra'); const get = require('lodash.get'); const set = require('lodash.set'); -const logger = require('../logger'); +const logger = require('./logger'); require('dotenv').config(); diff --git a/src/database.js b/src/database.js index bfce6ef..209b5ef 100644 --- a/src/database.js +++ b/src/database.js @@ -4,7 +4,7 @@ const joi = require('joi'); const util = require('./util'); const { PNID } = require('./models/pnid'); const { Server } = require('./models/server'); -const logger = require('../logger'); +const logger = require('./logger'); const { config } = require('./config-manager'); const { connection_string, options } = config.mongoose; diff --git a/logger.js b/src/logger.js similarity index 100% rename from logger.js rename to src/logger.js diff --git a/src/server.js b/src/server.js index 9372a3a..a0b86cd 100644 --- a/src/server.js +++ b/src/server.js @@ -10,7 +10,7 @@ const xmlparser = require('./middleware/xml-parser'); const cache = require('./cache'); const database = require('./database'); const util = require('./util'); -const logger = require('../logger'); +const logger = require('./logger'); const { config } = configManager; diff --git a/src/services/api/index.js b/src/services/api/index.js index 8db69f5..5aee4a6 100644 --- a/src/services/api/index.js +++ b/src/services/api/index.js @@ -4,7 +4,7 @@ const express = require('express'); const subdomain = require('express-subdomain'); const cors = require('cors'); const APIMiddleware = require('../../middleware/api'); -const logger = require('../../../logger'); +const logger = require('../../logger'); const routes = require('./routes'); // Router to handle the subdomain restriction diff --git a/src/services/api/routes/v1/register.js b/src/services/api/routes/v1/register.js index 729bc41..860fad4 100644 --- a/src/services/api/routes/v1/register.js +++ b/src/services/api/routes/v1/register.js @@ -11,7 +11,7 @@ const { NEXAccount } = require('../../../../models/nex-account'); const database = require('../../../../database'); const cache = require('../../../../cache'); const util = require('../../../../util'); -const logger = require('../../../../../logger'); +const logger = require('../../../../logger'); const { config, disabledFeatures } = require('../../../../config-manager'); const PNID_VALID_CHARACTERS_REGEX = /^[\w\-\.]*$/gm; diff --git a/src/services/assets/index.js b/src/services/assets/index.js index 2059739..5061bf3 100644 --- a/src/services/assets/index.js +++ b/src/services/assets/index.js @@ -2,7 +2,7 @@ const express = require('express'); const subdomain = require('express-subdomain'); -const logger = require('../../../logger'); +const logger = require('../../logger'); const path = require('path'); // Router to handle the subdomain restriction diff --git a/src/services/conntest/index.js b/src/services/conntest/index.js index ebe2515..bd4b823 100644 --- a/src/services/conntest/index.js +++ b/src/services/conntest/index.js @@ -2,7 +2,7 @@ const express = require('express'); const subdomain = require('express-subdomain'); -const logger = require('../../../logger'); +const logger = require('../../logger'); // Router to handle the subdomain restriction const conntest = express.Router(); diff --git a/src/services/datastore/index.js b/src/services/datastore/index.js index ab263d2..a5803d1 100644 --- a/src/services/datastore/index.js +++ b/src/services/datastore/index.js @@ -1,6 +1,6 @@ const express = require('express'); const subdomain = require('express-subdomain'); -const logger = require('../../../logger'); +const logger = require('../../logger'); const routes = require('./routes'); // Router to handle the subdomain diff --git a/src/services/local-cdn/index.js b/src/services/local-cdn/index.js index b0e3985..ca8b894 100644 --- a/src/services/local-cdn/index.js +++ b/src/services/local-cdn/index.js @@ -1,6 +1,6 @@ const express = require('express'); const subdomain = require('express-subdomain'); -const logger = require('../../../logger'); +const logger = require('../../logger'); const { config, disabledFeatures } = require('../../config-manager'); if (!disabledFeatures.s3) { diff --git a/src/services/nasc/index.js b/src/services/nasc/index.js index 9f4f9f3..9266a81 100644 --- a/src/services/nasc/index.js +++ b/src/services/nasc/index.js @@ -3,7 +3,7 @@ const express = require('express'); const subdomain = require('express-subdomain'); const NASCMiddleware = require('../../middleware/nasc'); -const logger = require('../../../logger'); +const logger = require('../../logger'); const routes = require('./routes'); // Router to handle the subdomain restriction diff --git a/src/services/nnid/index.js b/src/services/nnid/index.js index 84f1d71..39334b6 100644 --- a/src/services/nnid/index.js +++ b/src/services/nnid/index.js @@ -5,7 +5,7 @@ const subdomain = require('express-subdomain'); const clientHeaderCheck = require('../../middleware/client-header'); const cemuMiddleware = require('../../middleware/cemu'); const pnidMiddleware = require('../../middleware/pnid'); -const logger = require('../../../logger'); +const logger = require('../../logger'); const routes = require('./routes'); // Router to handle the subdomain restriction diff --git a/src/services/nnid/routes/people.js b/src/services/nnid/routes/people.js index 7d1287a..6460877 100644 --- a/src/services/nnid/routes/people.js +++ b/src/services/nnid/routes/people.js @@ -9,7 +9,7 @@ const deviceCertificateMiddleware = require('../../../middleware/device-certific const ratelimit = require('../../../middleware/ratelimit'); const database = require('../../../database'); const util = require('../../../util'); -const logger = require('../../../../logger'); +const logger = require('../../../logger'); require('moment-timezone'); /**