xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2025-01-14 14:43:17 +08:00
Code Actions Projects Activity

Removing memory DB fallback in case of DB error.

Browse Source 
App now terminates on an error.

Fixes #163
This commit is contained in:
Patrik J. Braun 2020-10-31 21:02:35 +01:00
parent acd3cf1fe5
commit 161e291939
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend/middlewares/admin/SettingsMWs.ts
View File

@ -3,7 +3,6 @@ import {NextFunction, Request, Response} from 'express';
import {ErrorCodes, ErrorDTO} from '../../../common/entities/Error'; import {ErrorCodes, ErrorDTO} from '../../../common/entities/Error';
import {ObjectManagers} from '../../model/ObjectManagers'; import {ObjectManagers} from '../../model/ObjectManagers';
import {Logger} from '../../Logger'; import {Logger} from '../../Logger';
import {SQLConnection} from '../../model/database/sql/SQLConnection';
import {Config} from '../../../common/config/private/Config'; import {Config} from '../../../common/config/private/Config';
import {ConfigDiagnostics} from '../../model/diagnostics/ConfigDiagnostics'; import {ConfigDiagnostics} from '../../model/diagnostics/ConfigDiagnostics';
import {BasicConfigDTO} from '../../../common/entities/settings/BasicConfigDTO'; import {BasicConfigDTO} from '../../../common/entities/settings/BasicConfigDTO';
@ -27,7 +26,7 @@ export class SettingsMWs {
try { try {
if (databaseSettings.type !== ServerConfig.DatabaseType.memory) { if (databaseSettings.type !== ServerConfig.DatabaseType.memory) {
await SQLConnection.tryConnection(databaseSettings); await ConfigDiagnostics.testDatabase(databaseSettings);
} }
Config.Server.Database = databaseSettings; Config.Server.Database = databaseSettings;
// only updating explicitly set config (not saving config set by the diagnostics) // only updating explicitly set config (not saving config set by the diagnostics)

10
src/backend/model/diagnostics/ConfigDiagnostics.ts
View File

@ -215,14 +215,8 @@ export class ConfigDiagnostics {
} catch (ex) { } catch (ex) {
const err: Error = ex; const err: Error = ex;
Logger.warn(LOG_TAG, '[SQL error]', err.toString()); Logger.warn(LOG_TAG, '[SQL error]', err.toString());
if (Config.Server.Database.enableFallback === true) { Logger.error(LOG_TAG, 'Error during initializing SQL DB, check DB connection and settings');
Logger.warn(LOG_TAG, 'Error during initializing SQL falling back temporally to memory DB'); process.exit(1);
NotificationManager.warning('Error during initializing SQL falling back temporally to memory DB', err.toString());
Config.Server.Database.type = ServerConfig.DatabaseType.memory;
} else {
Logger.error(LOG_TAG, 'Error during initializing SQL DB, check DB connection and settings');
process.exit(1);
}
} }
} }

3
src/common/config/private/PrivateConfig.ts
View File

@ -66,9 +66,6 @@ export module ServerConfig {
}) })
type: DatabaseType = DatabaseType.sqlite; type: DatabaseType = DatabaseType.sqlite;
@ConfigProperty({description: 'In the case of bad database settings (or unreachable database), the app falls back using inmemory database, otherwise terminates the app.'})
enableFallback: boolean = true;
@ConfigProperty() @ConfigProperty()
dbFolder: string = 'db'; dbFolder: string = 'db';