diff --git a/src/server.ts b/src/server.ts index 0feed7b..2d5c1de 100755 --- a/src/server.ts +++ b/src/server.ts @@ -41,7 +41,7 @@ import utils from './utils/utils' import dbtools from './utils/dbtools' import reqlogger from './middlewares/reqlogger.middleware' import idStats from './utils/ids' -import { paths, validateFiles } from './utils/files' +import { paths, validateAndSetupFiles } from './utils/files' import constants from './constants' const logFile = paths.logDir + logger.logFileName @@ -63,9 +63,6 @@ function moveLogIfNotFromToday(path: string, to: string) { moveLogIfNotFromToday(logFile, paths.logDir) moveLogIfNotFromToday(vlogFile, paths.vlogDir) -idStats.Load() -logger.Load() - interface Modules { [name: string]: Module } @@ -91,7 +88,7 @@ export interface SetupData { httpsServer: https.Server } -const filesValid = validateFiles() +const filesValid = validateAndSetupFiles() if (!filesValid) { const msg = 'Not all files are valid which are needed to run the server! Please resolve the above issues, and start again.' @@ -99,6 +96,9 @@ if (!filesValid) { throw new Error(msg) } +idStats.Load() +logger.Load() + const userDB = dbtools.GetDB(paths.usersDBPath) let modules: Modules = utils.ReadJSON(paths.modulesFile) diff --git a/src/utils/files.ts b/src/utils/files.ts index 2466371..35405d7 100644 --- a/src/utils/files.ts +++ b/src/utils/files.ts @@ -23,7 +23,7 @@ type FileDescriptor = { warningIfMissing?: boolean } -export const validateFiles = (): boolean => { +export const validateAndSetupFiles = (): boolean => { let everythingValid = true Object.entries(files).forEach(([key, file]: [string, FileDescriptor]) => { let fileExists = utils.FileExists(file.path)