From 73fefad4342a86c2713a60a0d648f5ad9252bf7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20B=C3=BCchel?= <damian.buechel@id.ethz.ch>
Date: Wed, 17 Jan 2024 20:28:23 +0100
Subject: [PATCH] SEBWIN-835: Removed debugging logs for power supply
thresholds.
---
.../Operations/ConfigurationOperation.cs | 2 --
.../ConfigurationRepository.cs | 10 ----------
SafeExamBrowser.Configuration/DataFormats/XmlParser.cs | 3 ---
.../PowerSupply/PowerSupply.cs | 6 ------
4 files changed, 21 deletions(-)
diff --git a/SafeExamBrowser.Client/Operations/ConfigurationOperation.cs b/SafeExamBrowser.Client/Operations/ConfigurationOperation.cs
index c6151e9e..2b5f9e08 100644
--- a/SafeExamBrowser.Client/Operations/ConfigurationOperation.cs
+++ b/SafeExamBrowser.Client/Operations/ConfigurationOperation.cs
@@ -45,8 +45,6 @@ namespace SafeExamBrowser.Client.Operations
logger.Info($" -> Runtime-ID: {Context.AppConfig.RuntimeId}");
logger.Info($" -> Session-ID: {Context.SessionId}");
- logger.Warn($"Power Supply Thresholds: Low = {configuration.Settings.PowerSupply.ChargeThresholdLow}, Critical = {configuration.Settings.PowerSupply.ChargeThresholdCritical}.");
-
return OperationResult.Success;
}
diff --git a/SafeExamBrowser.Configuration/ConfigurationRepository.cs b/SafeExamBrowser.Configuration/ConfigurationRepository.cs
index d787264c..4f8635b4 100644
--- a/SafeExamBrowser.Configuration/ConfigurationRepository.cs
+++ b/SafeExamBrowser.Configuration/ConfigurationRepository.cs
@@ -122,11 +122,8 @@ namespace SafeExamBrowser.Configuration
var status = default(LoadStatus);
settings = LoadDefaultSettings();
-
logger.Info($"Initialized default settings, now attempting to load '{resource}'...");
- logger.Warn($"Power Supply Thresholds: Low = {settings.PowerSupply.ChargeThresholdLow}, Critical = {settings.PowerSupply.ChargeThresholdCritical}.");
-
try
{
status = TryLoadData(resource, out var stream);
@@ -137,11 +134,6 @@ namespace SafeExamBrowser.Configuration
{
status = TryParseData(stream, out _, out _, out var data, password);
- data.TryGetValue(Keys.UserInterface.SystemControls.PowerSupply.ChargeThresholdCritical, out var critical);
- data.TryGetValue(Keys.UserInterface.SystemControls.PowerSupply.ChargeThresholdLow, out var low);
-
- logger.Warn($"Power Supply Thresholds: Low (raw) = {low}, Critical (raw) = {critical}.");
-
if (status == LoadStatus.Success)
{
dataMapper.MapRawDataToSettings(data, settings);
@@ -156,8 +148,6 @@ namespace SafeExamBrowser.Configuration
logger.Error($"Unexpected error while trying to load '{resource}'!", e);
}
- logger.Warn($"Power Supply Thresholds: Low = {settings.PowerSupply.ChargeThresholdLow}, Critical = {settings.PowerSupply.ChargeThresholdCritical}.");
-
return status;
}
diff --git a/SafeExamBrowser.Configuration/DataFormats/XmlParser.cs b/SafeExamBrowser.Configuration/DataFormats/XmlParser.cs
index 4d57a822..b7196049 100644
--- a/SafeExamBrowser.Configuration/DataFormats/XmlParser.cs
+++ b/SafeExamBrowser.Configuration/DataFormats/XmlParser.cs
@@ -260,10 +260,7 @@ namespace SafeExamBrowser.Configuration.DataFormats
value = Convert.ToInt32(element.Value);
break;
case XmlElement.Real:
- logger.Warn($"Power Supply Threshold: Raw XML = {element}.");
- logger.Warn($"Power Supply Threshold: Raw XML value = {element.Value}.");
value = Convert.ToDouble(element.Value, CultureInfo.InvariantCulture);
- logger.Warn($"Power Supply Threshold: Parsed double value = {value}.");
break;
case XmlElement.String:
value = element.IsEmpty ? null : element.Value;
diff --git a/SafeExamBrowser.SystemComponents/PowerSupply/PowerSupply.cs b/SafeExamBrowser.SystemComponents/PowerSupply/PowerSupply.cs
index 57858866..f6f192e2 100644
--- a/SafeExamBrowser.SystemComponents/PowerSupply/PowerSupply.cs
+++ b/SafeExamBrowser.SystemComponents/PowerSupply/PowerSupply.cs
@@ -53,8 +53,6 @@ namespace SafeExamBrowser.SystemComponents.PowerSupply
lastStatusLog = DateTime.Now;
}
- logger.Warn($"Raw Charge: {charge}, Low Threshold: {low}, Critical Threshold: {critical}, Status: {status.BatteryChargeStatus}");
-
return status;
}
@@ -62,13 +60,9 @@ namespace SafeExamBrowser.SystemComponents.PowerSupply
{
const int TWO_SECONDS = 2000;
- logger.Warn($"Pre-Sanitized Low Threshold: {settings.ChargeThresholdLow}, Pre-Sanitized Critical Threshold: {settings.ChargeThresholdCritical}");
-
critical = SanitizeThreshold(settings.ChargeThresholdCritical);
low = SanitizeThreshold(settings.ChargeThresholdLow);
- logger.Warn($"Sanitized Low Threshold: {low}, Sanitized Critical Threshold: {critical}");
-
timer = new Timer(TWO_SECONDS);
timer.Elapsed += Timer_Elapsed;
timer.AutoReset = true;