From b5d91767fd3b336908193c1f09c53e2fe3581ec1 Mon Sep 17 00:00:00 2001
From: Niko Ehrenfeuchter <nikolaus.ehrenfeuchter@unibas.ch>
Date: Sun, 11 Feb 2018 22:09:40 +0100
Subject: [PATCH] Use string interpolation in status summary.
---
ATxCommon/Serializables/ServiceStatus.cs | 32 +++++++++---------------
1 file changed, 12 insertions(+), 20 deletions(-)
diff --git a/ATxCommon/Serializables/ServiceStatus.cs b/ATxCommon/Serializables/ServiceStatus.cs
index 186ab88..f99735e 100644
--- a/ATxCommon/Serializables/ServiceStatus.cs
+++ b/ATxCommon/Serializables/ServiceStatus.cs
@@ -326,26 +326,18 @@ namespace ATxCommon.Serializables
/// <returns>A string with details on the transfer.</returns>
public string Summary() {
return
- "CurrentTransferSrc: " + CurrentTransferSrc + "\n" +
- "CurrentTargetTmp: " + CurrentTargetTmp + "\n" +
- "TransferInProgress: " + TransferInProgress + "\n" +
- "CurrentTransferSize: " + CurrentTransferSize + "\n" +
- "LastStatusUpdate: " +
- LastStatusUpdate.ToString("yyyy-MM-dd HH:mm:ss") + " (" +
- TimeUtils.SecondsToHuman(TimeUtils.SecondsSince(LastStatusUpdate)) +
- " ago)\n" +
- "LastStorageNotification: " +
- LastStorageNotification.ToString("yyyy-MM-dd HH:mm:ss") + " (" +
- TimeUtils.SecondsToHuman(TimeUtils.SecondsSince(LastStorageNotification)) +
- " ago)\n" +
- "LastAdminNotification: " +
- LastAdminNotification.ToString("yyyy-MM-dd HH:mm:ss") + " (" +
- TimeUtils.SecondsToHuman(TimeUtils.SecondsSince(LastAdminNotification)) +
- " ago)\n" +
- "LastGraceNotification: " +
- LastGraceNotification.ToString("yyyy-MM-dd HH:mm:ss") + " (" +
- TimeUtils.SecondsToHuman(TimeUtils.SecondsSince(LastGraceNotification)) +
- " ago)\n";
+ $"CurrentTransferSrc: {CurrentTransferSrc}\n" +
+ $"CurrentTargetTmp: {CurrentTargetTmp}\n" +
+ $"TransferInProgress: {TransferInProgress}\n" +
+ $"CurrentTransferSize: {CurrentTransferSize}\n" +
+ $"LastStatusUpdate: {LastStatusUpdate:yyyy-MM-dd HH:mm:ss}" +
+ $" ({TimeUtils.SecondsToHuman(TimeUtils.SecondsSince(LastStatusUpdate))})\n" +
+ $"LastStorageNotification: {LastStorageNotification:yyyy-MM-dd HH:mm:ss}" +
+ $" ({TimeUtils.SecondsToHuman(TimeUtils.SecondsSince(LastStorageNotification))})\n" +
+ $"LastAdminNotification: {LastAdminNotification:yyyy-MM-dd HH:mm:ss}" +
+ $" ({TimeUtils.SecondsToHuman(TimeUtils.SecondsSince(LastAdminNotification))})\n" +
+ $"LastGraceNotification: {LastGraceNotification:yyyy-MM-dd HH:mm:ss}" +
+ $" ({TimeUtils.SecondsToHuman(TimeUtils.SecondsSince(LastGraceNotification))})\n";
}
#endregion validate and report
--
GitLab