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

SEBWIN-445: Ensured battery and WLAN data is only sent to server when values change.

Browse source
This commit is contained in:
Damian Büchel 2020-12-10 17:42:50 +01:00
parent 86242911a2
commit 9b8379bdae
1 changed files with 43 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
SafeExamBrowser.Server/ServerProxy.cs
View file

@ -39,6 +39,8 @@ namespace SafeExamBrowser.Server
private AppConfig appConfig; private AppConfig appConfig;
private CancellationTokenSource cancellationTokenSource; private CancellationTokenSource cancellationTokenSource;
private string connectionToken; private string connectionToken;
private int currentPowerSupplyValue;
private int currentWlanValue;
private string examId; private string examId;
private HttpClient httpClient; private HttpClient httpClient;
private ILogger logger; private ILogger logger;
@ -333,21 +335,27 @@ namespace SafeExamBrowser.Server
{ {
try try
{ {
var authorization = ("Authorization", $"Bearer {oauth2Token}"); var value = Convert.ToInt32(status.BatteryCharge * 100);
var chargeInfo = $"{status.BatteryChargeStatus} at {Convert.ToInt32(status.BatteryCharge * 100)}%";
var contentType = "application/json;charset=UTF-8";
var gridInfo = $"{(status.IsOnline ? "connected to" : "disconnected from")} the power grid";
var token = ("SEBConnectionToken", connectionToken);
var json = new JObject
{
["type"] = ToLogType(LogLevel.Info),
["timestamp"] = ToUnixTimestamp(DateTime.Now),
["text"] = $"<battery> {chargeInfo}, {status.BatteryTimeRemaining} remaining, {gridInfo}",
["numericValue"] = Convert.ToInt32(status.BatteryCharge * 100)
};
var content = json.ToString();
TryExecute(HttpMethod.Post, api.LogEndpoint, out var response, content, contentType, authorization, token); if (value != currentPowerSupplyValue)
{
var authorization = ("Authorization", $"Bearer {oauth2Token}");
var chargeInfo = $"{status.BatteryChargeStatus} at {value}%";
var contentType = "application/json;charset=UTF-8";
var gridInfo = $"{(status.IsOnline ? "connected to" : "disconnected from")} the power grid";
var token = ("SEBConnectionToken", connectionToken);
var json = new JObject
{
["type"] = ToLogType(LogLevel.Info),
["timestamp"] = ToUnixTimestamp(DateTime.Now),
["text"] = $"<battery> {chargeInfo}, {status.BatteryTimeRemaining} remaining, {gridInfo}",
["numericValue"] = value
};
var content = json.ToString();
TryExecute(HttpMethod.Post, api.LogEndpoint, out var response, content, contentType, authorization, token);
currentPowerSupplyValue = value;
}
} }
catch (Exception e) catch (Exception e)
{ {
@ -392,25 +400,33 @@ namespace SafeExamBrowser.Server
private void WirelessAdapter_NetworksChanged() private void WirelessAdapter_NetworksChanged()
{ {
const int NOT_CONNECTED = -1;
try try
{ {
var authorization = ("Authorization", $"Bearer {oauth2Token}");
var contentType = "application/json;charset=UTF-8";
var network = wirelessAdapter.GetNetworks().FirstOrDefault(n => n.Status == WirelessNetworkStatus.Connected); var network = wirelessAdapter.GetNetworks().FirstOrDefault(n => n.Status == WirelessNetworkStatus.Connected);
var token = ("SEBConnectionToken", connectionToken);
var json = new JObject { ["type"] = ToLogType(LogLevel.Info), ["timestamp"] = ToUnixTimestamp(DateTime.Now) };
if (network != default(IWirelessNetwork)) if (network?.SignalStrength != currentWlanValue)
{ {
json["text"] = $"<wlan> {network.Name}: {network.Status}, {network.SignalStrength}%"; var authorization = ("Authorization", $"Bearer {oauth2Token}");
json["numericValue"] = network.SignalStrength; var contentType = "application/json;charset=UTF-8";
} var token = ("SEBConnectionToken", connectionToken);
else var json = new JObject { ["type"] = ToLogType(LogLevel.Info), ["timestamp"] = ToUnixTimestamp(DateTime.Now) };
{
json["text"] = "<wlan> not connected";
}
TryExecute(HttpMethod.Post, api.LogEndpoint, out var response, json.ToString(), contentType, authorization, token); if (network != default(IWirelessNetwork))
{
json["text"] = $"<wlan> {network.Name}: {network.Status}, {network.SignalStrength}%";
json["numericValue"] = network.SignalStrength;
}
else
{
json["text"] = "<wlan> not connected";
}
TryExecute(HttpMethod.Post, api.LogEndpoint, out var response, json.ToString(), contentType, authorization, token);
currentWlanValue = network?.SignalStrength ?? NOT_CONNECTED;
}
} }
catch (Exception e) catch (Exception e)
{ {