zervo/seb-win-refactoring
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBWIN-835: Implemented further logging for power supply threshold issue.

Browse source
This commit is contained in:
Damian Büchel 2024-01-17 11:08:03 +01:00
parent c52c461dbf
commit c9db98159d
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SafeExamBrowser.Client/Operations/ConfigurationOperation.cs
View file

@ -16,8 +16,8 @@ namespace SafeExamBrowser.Client.Operations
{ {
internal class ConfigurationOperation : ClientOperation internal class ConfigurationOperation : ClientOperation
{ {
private ILogger logger; private readonly ILogger logger;
private IRuntimeProxy runtime; private readonly IRuntimeProxy runtime;
public override event ActionRequiredEventHandler ActionRequired { add { } remove { } } public override event ActionRequiredEventHandler ActionRequired { add { } remove { } }
public override event StatusChangedEventHandler StatusChanged; public override event StatusChangedEventHandler StatusChanged;
@ -45,6 +45,8 @@ namespace SafeExamBrowser.Client.Operations
logger.Info($" -> Runtime-ID: {Context.AppConfig.RuntimeId}"); logger.Info($" -> Runtime-ID: {Context.AppConfig.RuntimeId}");
logger.Info($" -> Session-ID: {Context.SessionId}"); logger.Info($" -> Session-ID: {Context.SessionId}");
logger.Warn($"Power Supply Thresholds: Low = {configuration.Settings.PowerSupply.ChargeThresholdLow}, Critical = {configuration.Settings.PowerSupply.ChargeThresholdCritical}.");
return OperationResult.Success; return OperationResult.Success;
} }

20
SafeExamBrowser.Configuration/ConfigurationRepository.cs
View file

@ -119,13 +119,17 @@ namespace SafeExamBrowser.Configuration
public LoadStatus TryLoadSettings(Uri resource, out AppSettings settings, PasswordParameters password = null) public LoadStatus TryLoadSettings(Uri resource, out AppSettings settings, PasswordParameters password = null)
{ {
var status = default(LoadStatus);
settings = LoadDefaultSettings(); settings = LoadDefaultSettings();
logger.Info($"Initialized default settings, now attempting to load '{resource}'..."); logger.Info($"Initialized default settings, now attempting to load '{resource}'...");
logger.Warn($"Power Supply Thresholds: Low = {settings.PowerSupply.ChargeThresholdLow}, Critical = {settings.PowerSupply.ChargeThresholdCritical}.");
try try
{ {
var status = TryLoadData(resource, out var stream); status = TryLoadData(resource, out var stream);
using (stream) using (stream)
{ {
@ -133,22 +137,28 @@ namespace SafeExamBrowser.Configuration
{ {
status = TryParseData(stream, out _, out _, out var data, password); 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) if (status == LoadStatus.Success)
{ {
dataMapper.MapRawDataToSettings(data, settings); dataMapper.MapRawDataToSettings(data, settings);
dataProcessor.Process(data, settings); dataProcessor.Process(data, settings);
} }
} }
return status;
} }
} }
catch (Exception e) catch (Exception e)
{ {
status = LoadStatus.UnexpectedError;
logger.Error($"Unexpected error while trying to load '{resource}'!", e); logger.Error($"Unexpected error while trying to load '{resource}'!", e);
return LoadStatus.UnexpectedError;
} }
logger.Warn($"Power Supply Thresholds: Low = {settings.PowerSupply.ChargeThresholdLow}, Critical = {settings.PowerSupply.ChargeThresholdCritical}.");
return status;
} }
private EncryptionParameters DetermineEncryptionForClientConfiguration(IDictionary<string, object> data, EncryptionParameters encryption) private EncryptionParameters DetermineEncryptionForClientConfiguration(IDictionary<string, object> data, EncryptionParameters encryption)