diff --git a/package-lock.json b/package-lock.json index 22539e60..e8b56190 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18721,9 +18721,9 @@ } }, "typeconfig": { - "version": "2.0.8", - "resolved": "https://registry.npmjs.org/typeconfig/-/typeconfig-2.0.8.tgz", - "integrity": "sha512-D2Qfq1Ub6aZ/P24VGiyufuepClsHt9doe7xPf2YbmEOUtJRGgyQSDNamQp6wFuTfFKjpQIqi+6moQelkPI9BwQ==", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/typeconfig/-/typeconfig-2.0.9.tgz", + "integrity": "sha512-ORNNNaYqPpPzxMJLTTQ1okjtp120BPUmBFxFN6gE/a4KzmeT8VcBd7ptFxv+/FsnnOogzd4uGg5jaGF+SWG4hQ==", "requires": { "optimist": "0.6.1" } diff --git a/package.json b/package.json index 35a319ad..932fad5b 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "sqlite3": "4.1.1", "ts-exif-parser": "0.1.4", "ts-node-iptc": "1.0.11", - "typeconfig": "2.0.8", + "typeconfig": "2.0.9", "typeorm": "0.2.21", "winston": "2.4.4" }, diff --git a/src/backend/server.ts b/src/backend/server.ts index ba4c87c9..a2fd1cf0 100644 --- a/src/backend/server.ts +++ b/src/backend/server.ts @@ -21,6 +21,8 @@ import * as unless from 'express-unless'; import {Event} from '../common/event/Event'; import {QueryParams} from '../common/QueryParams'; import {ServerConfig} from '../common/config/private/PrivateConfig'; +import {ConfigClassBuilder} from 'typeconfig/node'; +import {ConfigClassOptions} from 'typeconfig/src/decorators/class/IConfigClass'; const _session = require('cookie-session'); @@ -48,7 +50,8 @@ export class Server { async init(): Promise { Logger.info(LOG_TAG, 'running diagnostics...'); await ConfigDiagnostics.runDiagnostics(); - Logger.verbose(LOG_TAG, 'using config:'); + Logger.verbose(LOG_TAG, 'using config from ' + + (ConfigClassBuilder.attachPrivateInterface(Config).__options).configPath + ':'); Logger.verbose(LOG_TAG, JSON.stringify(Config, null, '\t')); this.app = _express();