From e0baf06c75bfb4a8ebac1b6aae7d8a835234fb6f Mon Sep 17 00:00:00 2001
From: Niko Ehrenfeuchter <nikolaus.ehrenfeuchter@unibas.ch>
Date: Fri, 16 Feb 2018 00:08:57 +0100
Subject: [PATCH] Update summary to contain all config settings and improve
output.
Refers to #18, #28, #29
---
ATxCommon/Serializables/ServiceConfig.cs | 47 +++++++++++++++++-------
1 file changed, 34 insertions(+), 13 deletions(-)
diff --git a/ATxCommon/Serializables/ServiceConfig.cs b/ATxCommon/Serializables/ServiceConfig.cs
index 1414f50..4f77eba 100644
--- a/ATxCommon/Serializables/ServiceConfig.cs
+++ b/ATxCommon/Serializables/ServiceConfig.cs
@@ -412,43 +412,64 @@ namespace ATxCommon.Serializables
/// <returns>A string with details on the configuration.</returns>
public string Summary() {
var msg =
+ "############### REQUIRED PARAMETERS ###############\n" +
$"HostAlias: {HostAlias}\n" +
$"SourceDrive: {SourceDrive}\n" +
$"IncomingDirectory: {IncomingDirectory}\n" +
- $"MarkerFile: {MarkerFile}\n" +
$"ManagedDirectory: {ManagedDirectory}\n" +
- $"GracePeriod: {GracePeriod} (" +
- TimeUtils.DaysToHuman(GracePeriod, false) + ")\n" +
+ $"DestinationAlias: {DestinationAlias}\n" +
$"DestinationDirectory: {DestinationDirectory}\n" +
$"TmpTransferDir: {TmpTransferDir}\n" +
- $"EnforceInheritedACLs: {EnforceInheritedACLs}\n" +
+ $"MaxCpuUsage: {MaxCpuUsage}%\n" +
+ $"MinAvailableMemory: {MinAvailableMemory} MB\n" +
+ "\n" +
+ "############### OPTIONAL PARAMETERS ###############\n" +
+ $"Debug: {Debug}\n" +
$"ServiceTimer: {ServiceTimer} ms\n" +
+ $"MarkerFile: {MarkerFile}\n" +
+ $"GracePeriod: {GracePeriod} (" +
+ TimeUtils.DaysToHuman(GracePeriod, false) + ")\n" +
+ $"EnforceInheritedACLs: {EnforceInheritedACLs}\n" +
$"InterPacketGap: {InterPacketGap}\n" +
- $"MaxCpuUsage: {MaxCpuUsage}%\n" +
- $"MinAvailableMemory: {MinAvailableMemory}\n";
+ "";
+
+ var blacklist = "";
foreach (var processName in BlacklistedProcesses) {
- msg += $"BlacklistedProcess: {processName}\n";
+ blacklist += $" ProcessName: {processName}\n";
}
+ if (!string.IsNullOrWhiteSpace(blacklist))
+ msg += $"BlacklistedProcesses:\n{blacklist}";
+
+
+ var space = "";
foreach (var drive in SpaceMonitoring) {
- msg += $"Drive to check free space: {drive.DriveName} " +
+ space += $" DriveName: {drive.DriveName} " +
$"(threshold: {Conv.MegabytesToString(drive.SpaceThreshold)})\n";
}
- if (string.IsNullOrEmpty(SmtpHost)) {
+ if (!string.IsNullOrWhiteSpace(space))
+ msg += $"SpaceMonitoring:\n{space}";
+
+ if (string.IsNullOrWhiteSpace(SmtpHost)) {
msg += "SmtpHost: ====== Not configured, disabling email! ======" + "\n";
} else {
msg +=
$"SmtpHost: {SmtpHost}\n" +
+ $"SmtpPort: {SmtpPort}\n" +
$"SmtpUserCredential: {SmtpUserCredential}\n" +
- $"EmailPrefix: {EmailPrefix}\n" +
+ $"SmtpPasswortCredential: --- not showing ---\n" +
$"EmailFrom: {EmailFrom}\n" +
+ $"EmailPrefix: {EmailPrefix}\n" +
$"AdminEmailAdress: {AdminEmailAdress}\n" +
$"AdminDebugEmailAdress: {AdminDebugEmailAdress}\n" +
- $"StorageNotificationDelta: {StorageNotificationDelta} (" +
- TimeUtils.MinutesToHuman(StorageNotificationDelta, false) + ")\n" +
+ $"SendTransferNotification: {SendTransferNotification}\n" +
+ $"SendAdminNotification: {SendAdminNotification}\n" +
$"AdminNotificationDelta: {AdminNotificationDelta} (" +
TimeUtils.MinutesToHuman(AdminNotificationDelta, false) + ")\n" +
$"GraceNotificationDelta: {GraceNotificationDelta} (" +
- TimeUtils.MinutesToHuman(GraceNotificationDelta, false) + ")\n";
+ TimeUtils.MinutesToHuman(GraceNotificationDelta, false) + ")\n" +
+ $"StorageNotificationDelta: {StorageNotificationDelta} (" +
+ TimeUtils.MinutesToHuman(StorageNotificationDelta, false) + ")\n" +
+ "";
}
return msg;
}
--
GitLab