Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ const Log = require("logger");
// global absolute root path
global.root_path = path.resolve(`${__dirname}/../`);

const Server = require(`${__dirname}/server`);
const Utils = require(`${__dirname}/utils`);

// used to control fetch timeout for node_helpers
const { setGlobalDispatcher, Agent } = require("undici");

const Server = require("./server");
const Utils = require("./utils");

const { getEnvVarsAsObj } = require("#server_functions");
// common timeout value, provide environment override in case
const fetch_timeout = process.env.mmFetchTimeout !== undefined ? process.env.mmFetchTimeout : 30000;
Expand Down
7 changes: 4 additions & 3 deletions js/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ const express = require("express");
const helmet = require("helmet");
const socketio = require("socket.io");
const Log = require("logger");
const { getHtml, getVersion, getEnvVars, cors } = require("#server_functions");

const { ipAccessControl } = require(`${__dirname}/ip_access_control`);
const { ipAccessControl } = require("./ip_access_control");

const vendor = require("./vendor");

const vendor = require(`${__dirname}/vendor`);
const { getHtml, getVersion, getEnvVars, cors } = require("#server_functions");

/**
* Server
Expand Down
2 changes: 1 addition & 1 deletion js/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ const checkDeprecatedOptions = (userConfig) => {
*/
const loadConfig = () => {
Log.log("Loading config ...");
const defaults = require(`${__dirname}/defaults`);
const defaults = require("./defaults");
if (global.mmTestMode) {
// if we are running in test mode
defaults.address = "0.0.0.0";
Expand Down