AppStd/Monorepo
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert changes in Database module

Browse Source
This commit is contained in:
Jonathan Jenne 2022-11-14 10:50:44 +01:00
parent 80f858bdf5
commit 873b024f13
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
WEBSERVICES/ZUGFeRDRESTService/Database.cs
View File

@ -23,31 +23,25 @@ namespace ZUGFeRDRESTService
public MSSQLServer MSSQL { get; set; } public MSSQLServer MSSQL { get; set; }
public Firebird Firebird { get; set; } public Firebird Firebird { get; set; }
public Database(ILogging Logging, IConfiguration Config, IOptions<Config> Options) public Database(ILogging Logging, IConfiguration Config)
{ {
var LogConfig = Logging.LogConfig; var oLogConfig = Logging.LogConfig;
var Logger = Logging.LogConfig.GetLogger(); var oLogger = Logging.LogConfig.GetLogger();
var FirebirdConfig = Options.Value.Firebird; var oAppConfig = Config.GetSection("Config");
var oFirebirdConfig = oAppConfig.GetSection("Firebird");
// var AppConfig = Config.GetSection("Config"); oLogger.Debug("Establishing MSSQL Database connection..");
// var FBConfig = AppConfig.GetSection("Firebird"); MSSQL = new MSSQLServer(oLogConfig, oAppConfig["MSSQLConnectionString"]);
oLogger.Debug("Establishing Firebird Database connection..");
Firebird = new Firebird(oLogConfig,
oFirebirdConfig["Datasource"],
oFirebirdConfig["Database"],
oFirebirdConfig["Username"],
oFirebirdConfig["Password"]);
Logger.Debug("Establishing MSSQL Database connection.."); oLogger.Debug("MSSQL Connection: [{0}]", MSSQL.CurrentConnectionString);
MSSQL = new MSSQLServer(LogConfig, Options.Value.MSSQLConnectionString); oLogger.Debug("Firebird Connection: [{0}]", Firebird.ConnectionString);
Logger.Debug("Establishing Firebird Database connection..");
Firebird = new Firebird(LogConfig,
FirebirdConfig.Datasource,
FirebirdConfig.Database,
FirebirdConfig.Username,
FirebirdConfig.Password);
// MSSQL = new MSSQLServer(LogConfig, AppConfig["MSSQLConnectionString"]);
// Firebird = new Firebird(LogConfig, FBConfig["Datasource"], FBConfig["Database"], FBConfig["Username"], FBConfig["Password"]);
Logger.Debug("MSSQL Connection: [{0}]", MSSQL.CurrentConnectionString);
Logger.Debug("Firebird Connection: [{0}]", Firebird.ConnectionString);
} }
public string GetGDPictureKey() public string GetGDPictureKey()