IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web: Login: applied nconf, logPath is now taken from appsettings.services.json

Browse Source
This commit is contained in:
Artem Tarasov 2022-08-24 17:37:47 +03:00
parent 436fb991de
commit 999d9c7abd
3 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/login/src/server/config/config.json
View File

@ -1,3 +1,6 @@
{
"PORT": "5011"
"PORT": "5011",
"app": {
"appsettings": "../../../config"
}
}

36
packages/login/src/server/config/index.ts Normal file
View File

@ -0,0 +1,36 @@
import nconf from "nconf";
import path from "path";
import fs from "fs";
nconf.argv().env().file("config", path.join(__dirname, "config.json"));
getAndSaveAppsettings();
function getAndSaveAppsettings() {
let appsettings: string = nconf.get("app").appsettings;
if (!path.isAbsolute(appsettings)) {
appsettings = path.join(__dirname, appsettings);
}
const env: string = nconf.get("app").environment;
const valueEnv: string = nconf.get(env);
const fileWithEnv = path.join(
appsettings,
"appsettings." + valueEnv + ".json"
);
if (fs.existsSync(fileWithEnv)) {
nconf.file("appsettings", fileWithEnv);
} else {
nconf.file("appsettings", path.join(appsettings, "appsettings.json"));
}
nconf.file(
"appsettingsServices",
path.join(appsettings, "appsettings.services.json")
);
}
export default nconf;

15
packages/login/src/server/lib/logger.ts
View File

@ -2,19 +2,18 @@ import { createLogger, transports, format } from "winston";
import "winston-daily-rotate-file";
import path from "path";
import fs from "fs";
import config from "../config";
let logpath = process.env.logpath || null;
let logPath: string = config.get("logPath");
if (logpath != null) {
if (!path.isAbsolute(logpath)) {
logpath = path.join(__dirname, "..", logpath);
if (logPath != null) {
if (!path.isAbsolute(logPath)) {
logPath = path.join(__dirname, "..", logPath);
}
}
const fileName = IS_DEVELOPMENT
? path.join(__dirname, "..", "..", "..", "Logs", "login.%DATE%.log")
: logpath
? path.join(logpath, "login.%DATE%.log")
const fileName = logPath
? path.join(logPath, "login.%DATE%.log")
: path.join(__dirname, "..", "..", "..", "Logs", "login.%DATE%.log");
const dirName = path.dirname(fileName);