From b0d538de7f7217df02d46a993978ceb0576023bc Mon Sep 17 00:00:00 2001
From: Niko Ehrenfeuchter <nikolaus.ehrenfeuchter@unibas.ch>
Date: Mon, 12 Mar 2018 15:13:46 +0100
Subject: [PATCH] Use property from timer directly rather than shadowing it
locally.
Refers to #36
---
ATxCommon/Monitoring/Cpu.cs | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/ATxCommon/Monitoring/Cpu.cs b/ATxCommon/Monitoring/Cpu.cs
index d653d11..d9ec842 100644
--- a/ATxCommon/Monitoring/Cpu.cs
+++ b/ATxCommon/Monitoring/Cpu.cs
@@ -21,8 +21,6 @@ namespace ATxCommon.Monitoring
private int _limit;
private int _behaving;
private int _probation;
- private bool _enabled;
-
/// <summary>
/// Current CPU load (usage percentage over all cores).
@@ -69,8 +67,11 @@ namespace ATxCommon.Monitoring
/// Indicating whether the CPU load monitoring is active.
/// </summary>
public bool Enabled {
- get => _enabled;
- set => EnableTimer(value);
+ get => _monitoringTimer.Enabled;
+ set {
+ Log.Debug("{0} CPU monitoring.", value ? "Enabling" : "Disabling");
+ _monitoringTimer.Enabled = value;
+ }
}
@@ -101,11 +102,6 @@ namespace ATxCommon.Monitoring
Log.Debug("Initializing CPU monitoring completed.");
}
- private void EnableTimer(bool enabled) {
- Log.Debug("{0} CPU monitoring.", enabled ? "Enabling" : "Disabling");
- _monitoringTimer.Enabled = enabled;
- _enabled = enabled;
- }
private void UpdateCpuLoad(object sender, ElapsedEventArgs e) {
_monitoringTimer.Enabled = false;
--
GitLab