Skip to content

Commit

Permalink
Fix paths for logger
Browse files Browse the repository at this point in the history
  • Loading branch information
LewisBroadhurst committed Mar 28, 2024
1 parent 4ab7b53 commit 09f5a9e
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ if (argv.v) {

const proxy = require('./src/proxy');
const service = require('./src/service');
const logger = require('/src/logs/logger');
const logger = require('./src/logging/logger');

proxy.start();
service.start();
Expand Down
2 changes: 1 addition & 1 deletion src/config/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const fs = require('fs');

const defaultSettings = require('../../proxy.config.json');
const logger = require('/src/logs/logger');
const logger = require('../../src/logging/logger');
const userSettingsPath = require('./file').configFile;

let _userSettings = null;
Expand Down
2 changes: 1 addition & 1 deletion src/db/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const passwordHash = require('password-hash');
const validator = require('email-validator');

const config = require('../config');
const logger = require('/src/logs/logger');
const logger = require('../../src/logging/logger');

if (config.getDatabase().type === 'fs') {
sink = require('../db/file');
Expand Down
2 changes: 1 addition & 1 deletion src/logging/logger.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ const logger = winston.createLogger({
],
});

export default logger;
module.exports = logger;
2 changes: 1 addition & 1 deletion src/plugin.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const logger = require('/src/logs/logger');
const logger = require('../src/logging/logger');
const path = require('path');
const lpModule = import('load-plugin');
('use strict');
Expand Down
2 changes: 1 addition & 1 deletion src/proxy/chain.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const proc = require('./processors');
const plugin = require('../plugin');
const logger = require('/src/logs/logger');
const logger = require('../../src/logging/logger');

const pushActionChain = [
proc.push.parsePush,
Expand Down
2 changes: 1 addition & 1 deletion src/proxy/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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('/src/logs/logger');
const logger = require('../logging/logger');
const { GIT_PROXY_SERVER_PORT: proxyHttpPort } = require('../config/env').Vars;

const options = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const Step = require('../../actions').Step;
const db = require('../../../db');
const logger = require('/src/logs/logger');
const logger = require('../../../../src/logging/logger');

// Execute if the repo is approved
const exec = async (req, action, authorisedList = db.getRepos) => {
Expand Down
2 changes: 1 addition & 1 deletion src/proxy/routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const proxy = require('express-http-proxy');
const router = express.Router();
const chain = require('../chain');

const logger = require('/src/logs/logger');
const logger = require('../../../src/logging/logger');

/**
* For a given Git HTTP request destined for a GitHub repo,
Expand Down
2 changes: 1 addition & 1 deletion src/service/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const express = require('express');
const session = require('express-session');
const http = require('http');
const cors = require('cors');
const logger = require('/src/logs/logger');
const logger = require('../logging/logger');
const app = express();

const { GIT_PROXY_UI_PORT: uiPort } = require('../config/env').Vars;
Expand Down
2 changes: 1 addition & 1 deletion src/service/routes/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -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('/src/logs/logger');
const logger = require('../../logging/logger');

router.post('/login', passport.authenticate(passportType), (req, res) => {
res.send({
Expand Down
2 changes: 1 addition & 1 deletion src/service/routes/users.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const express = require('express');
const router = new express.Router();
const db = require('../../db');
const logger = require('/src/logs/logger');
const logger = require('../../logging/logger');

router.get('/', async (req, res) => {
if (req.user) {
Expand Down

0 comments on commit 09f5a9e

Please sign in to comment.