feat: fix up imports and make logger into a module

index.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 /* eslint-disable max-len */
+const { logger } = require('./src/logging/index');
+
 const argv = require('yargs/yargs')(process.argv.slice(2))
   .usage('Usage: $0 [options]')
   .options({
@@ -46,10 +48,9 @@ if (argv.v) {
 
 const proxy = require('./src/proxy');
 const service = require('./src/service');
-const logger = require('./src/logging/logger');
 
 proxy.start();
 service.start();
 
 module.exports.proxy = proxy;
-module.exports.service = service;
+module.exports.service = service;

scripts/prepare.js

@@ -4,7 +4,7 @@
 
 const { execSync } = require('child_process');
 const { existsSync } = require('fs');
-const logger = require('../src/logging/logger');
+const { logger } = require('../src/logging/index');
 
 // ===========
 // File paths.

src/config/index.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 
 const defaultSettings = require('../../proxy.config.json');
-const logger = require('../../src/logging/logger');
+const { logger } = require('../logging/index');
 const userSettingsPath = require('./file').configFile;
 
 let _userSettings = null;

src/db/index.js

@@ -4,7 +4,7 @@ const passwordHash = require('password-hash');
 const validator = require('email-validator');
 
 const config = require('../config');
-const logger = require('../../src/logging/logger');
+const { logger } = require('../logging/index');
 
 if (config.getDatabase().type === 'fs') {
   sink = require('../db/file');

src/plugin.js

@@ -1,4 +1,4 @@
-const logger = require('../src/logging/logger');
+const { logger } = require('./logging/index');
 const path = require('path');
 const lpModule = import('load-plugin');
 ('use strict');

src/proxy/chain.js

@@ -1,6 +1,6 @@
 const proc = require('./processors');
 const plugin = require('../plugin');
-const logger = require('../../src/logging/logger');
+const { logger } = require('../logging/index');
 
 const pushActionChain = [
   proc.push.parsePush,

src/proxy/index.js

@@ -4,7 +4,7 @@ const bodyParser = require('body-parser');
 const router = require('./routes').router;
 const config = require('../config');
 const db = require('../db');
-const { logger } = require('../logging/logger');
+const { logger } = require('../logging/index');
 const { GIT_PROXY_SERVER_PORT: proxyHttpPort } = require('../config/env').Vars;
 
 const options = {

src/proxy/processors/push-action/checkRepoInAuthorisedList.js

@@ -1,6 +1,6 @@
 const Step = require('../../actions').Step;
 const db = require('../../../db');
-const logger = require('../../../../src/logging/logger');
+const { logger } = require('../../../logging/index');
 
 // Execute if the repo is approved
 const exec = async (req, action, authorisedList = db.getRepos) => {

src/proxy/routes/index.js

@@ -5,7 +5,7 @@ const proxy = require('express-http-proxy');
 const router = express.Router();
 const chain = require('../chain');
 
-const logger = require('../../../src/logging/logger');
+const { logger } = require('../../logging/index');
 
 /**
  * For a given Git HTTP request destined for a GitHub repo,

src/service/index.js

@@ -2,10 +2,10 @@ const express = require('express');
 const session = require('express-session');
 const http = require('http');
 const cors = require('cors');
-const { logger } = require('../logging/logger');
 const app = express();
 const rateLimit = require('express-rate-limit');
 const lusca = require('lusca');
+const { logger } = require('../logging/index');
 
 const limiter = rateLimit({
   windowMs: 15 * 60 * 1000, // 15 minutes

src/service/routes/auth.js

@@ -5,7 +5,7 @@ const db = require('../../db');
 const passportType = passport.type;
 const generator = require('generate-password');
 const passwordHash = require('password-hash');
-const logger = require('../../logging/logger');
+const { logger } = require('../../logging/index');
 
 router.post('/login', passport.authenticate(passportType), (req, res) => {
   res.send({

src/service/routes/users.js

@@ -1,7 +1,7 @@
 const express = require('express');
 const router = new express.Router();
 const db = require('../../db');
-const logger = require('../../logging/logger');
+const { logger } = require('../../logging/index');
 
 router.get('/', async (req, res) => {
   if (req.user) {