From 51a4f06289d78577477781ea9586b8242d3fd6fe Mon Sep 17 00:00:00 2001
From: Niko Ehrenfeuchter <nikolaus.ehrenfeuchter@unibas.ch>
Date: Wed, 20 Dec 2017 00:39:16 +0100
Subject: [PATCH] Move assembly of paths into LoadConfigXml.
---
AutoTx/AutoTx.cs | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/AutoTx/AutoTx.cs b/AutoTx/AutoTx.cs
index 4a5b80b..45ed6c0 100644
--- a/AutoTx/AutoTx.cs
+++ b/AutoTx/AutoTx.cs
@@ -125,6 +125,8 @@ namespace AutoTx
private void LoadConfigXml() {
try {
_config = ServiceConfig.Deserialize(_configPath);
+ _incomingPath = Path.Combine(_config.SourceDrive, _config.IncomingDirectory);
+ _managedPath = Path.Combine(_config.SourceDrive, _config.ManagedDirectory);
writeLogDebug("Loaded config from " + _configPath);
}
catch (ConfigurationErrorsException ex) {
@@ -163,16 +165,8 @@ namespace AutoTx
/// </summary>
public void CheckConfiguration() {
var configInvalid = false;
- try {
- _incomingPath = Path.Combine(_config.SourceDrive, _config.IncomingDirectory);
- _managedPath = Path.Combine(_config.SourceDrive, _config.ManagedDirectory);
- if (CheckSpoolingDirectories() == false) {
- writeLog("ERROR checking spooling directories (incoming / managed)!");
- configInvalid = true;
- }
- }
- catch (Exception ex) {
- writeLog("Error in CheckConfiguration(): " + ex.Message + " " + ex.StackTrace);
+ if (CheckSpoolingDirectories() == false) {
+ writeLog("ERROR checking spooling directories (incoming / managed)!");
configInvalid = true;
}
--
GitLab