Skip to content

Commit 4e85fab

Browse files
committed
fix: replace all old config imports with new config file
1 parent 36c2a3b commit 4e85fab

File tree

6 files changed

+6
-7
lines changed

6 files changed

+6
-7
lines changed

config/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const developmentConfig = require('./development-config');
22
const testConfig = require('./test-config');
33

4-
if (process.env.NODE_PATH === 'test') {
4+
if (process.env.NODE_ENV === 'test') {
55
module.exports = testConfig;
66
}
77
else {

config/development-config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ exports = module.exports = {
1010

1111
// Database config for a postgresql db (docker based or native)
1212
DB: {
13-
DATABASE: process.env.DB_NAME || 'judgeapi',
13+
DATABASE: process.env.DB_NAME || 'judgeapi-dev',
1414
USERNAME: process.env.DB_USER || 'judgeapi',
1515
PASSWORD: process.env.DB_PASS || 'judgeapi',
1616
HOST: process.env.DB_HOST || 'localhost'

src/rabbitmq/jobqueue.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as amqp from 'amqplib/callback_api'
22
import { Channel, Connection } from 'amqplib/callback_api'
33
import { EventEmitter } from 'events'
44
const debug = require('debug')('judge:api:jobqueue')
5-
import config = require('../../config')
5+
const config = require('../../config/config')
66

77
export interface SubmissionJob {
88
id: number

src/run.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import app from './server'
2-
import config = require('../config')
32
import * as debug from 'debug'
43
import DB from 'models'
54

5+
const config = require('../config/config')
66
const log = debug('judge:api')
77

88
DB.sequelize.sync({})

src/utils/s3.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import Minio = require('minio')
22
import v4 = require('uuid/v4')
33
import axios from 'axios'
4-
import config = require('../../config')
54

5+
const config = require('../../config/config')
66
const client = new Minio.Client({
77
endPoint: config.S3.endpoint,
88
port: +config.S3.port,

test/utils/utils.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import * as amqp from 'amqplib/callback_api';
2-
import config = require('../../config');
32
import DB from "../../src/models";
4-
3+
const config = require('../../config/config');
54

65
const jobQ = 'job_queue'
76
const successQ = 'success_queue'

0 commit comments

Comments
 (0)