Skip to content

Commit 74599bd

Browse files
chkr1011chkr1011
committed
Fix bugs in history.
1 parent a3cebcd commit 74599bd

File tree

4 files changed

+78
-41
lines changed

4 files changed

+78
-41
lines changed

‎Wirehome.Core/History/HistoryService.cs

Lines changed: 73 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ public void Start()
7373
return;
7474
}
7575

76-
_repository.ComponentStatusPullInterval = _settings.ComponentStatusPullInterval;
76+
// Give the pulling code some time to complete before declaring an entity
77+
// as outdated. 1.25 might be enough additional time.
78+
_repository.ComponentStatusOutdatedTimeout = _settings.ComponentStatusPullInterval * 1.25;
7779

7880
AttachToMessageBus();
7981

@@ -90,51 +92,53 @@ public void Start()
9092

9193
public HistoryExtract BuildHistoryExtract(string componentUid, string statusUid, DateTime rangeStart, DateTime rangeEnd, TimeSpan interval, HistoryExtractDataType dataType)
9294
{
93-
return new HistoryExtractBuilder(_repository).Build(componentUid, statusUid, rangeStart, rangeEnd, interval, dataType);
94-
}
95+
var historyExtract = new HistoryExtractBuilder(_repository).Build(componentUid, statusUid, rangeStart, rangeEnd, interval, dataType);
96+
for (var i = historyExtract.DataPoints.Count - 1; i > 0; i--)
97+
{
9598

96-
private void AttachToMessageBus()
97-
{
98-
var filter = new WirehomeDictionary()
99-
.WithValue("type", "component_registry.event.status_changed");
99+
}
100100

101-
_messageBusService.Subscribe("history_receiver", filter, OnComponentStatusChanged);
101+
return historyExtract;
102102
}
103103

104-
private void OnComponentStatusChanged(WirehomeDictionary message)
104+
private bool TryInitializeRepository()
105105
{
106106
try
107107
{
108-
var componentStatusValue = new ComponentStatusValue
109-
{
110-
ComponentUid = Convert.ToString(message["component_uid"], CultureInfo.InvariantCulture),
111-
StatusUid = Convert.ToString(message["status_uid"], CultureInfo.InvariantCulture),
112-
Value = Convert.ToString(message.GetValueOrDefault("new_value", null), CultureInfo.InvariantCulture),
113-
Timestamp = DateTime.UtcNow
114-
};
108+
var repository = new HistoryRepository();
109+
repository.Initialize();
110+
_repository = repository;
115111

116-
_pendingComponentStatusValues.Add(componentStatusValue, _systemService.CancellationToken);
112+
return true;
117113
}
118114
catch (Exception exception)
119115
{
120-
_logger.LogError(exception, "Error while processing changed component status.");
116+
_logger.Log(LogLevel.Warning, exception, "Error while initializing history repository.");
117+
return false;
121118
}
122119
}
123120

124-
private bool TryInitializeRepository()
121+
private void AttachToMessageBus()
122+
{
123+
var filter = new WirehomeDictionary()
124+
.WithValue("type", "component_registry.event.status_changed");
125+
126+
_messageBusService.Subscribe("history_receiver", filter, OnComponentStatusChanged);
127+
}
128+
129+
private void OnComponentStatusChanged(WirehomeDictionary message)
125130
{
126131
try
127132
{
128-
var repository = new HistoryRepository();
129-
repository.Initialize();
130-
_repository = repository;
131-
132-
return true;
133+
TryEnqueueComponentStatusValue(
134+
Convert.ToString(message["component_uid"], CultureInfo.InvariantCulture),
135+
Convert.ToString(message["status_uid"], CultureInfo.InvariantCulture),
136+
message.GetValueOrDefault("new_value", null),
137+
DateTime.UtcNow);
133138
}
134139
catch (Exception exception)
135140
{
136-
_logger.Log(LogLevel.Warning, exception, "Error while initializing history repository.");
137-
return false;
141+
_logger.LogError(exception, "Error while processing changed component status.");
138142
}
139143
}
140144

@@ -184,21 +188,17 @@ private async Task TryUpdateComponentStatusValuesAsync(CancellationToken cancell
184188
{
185189
try
186190
{
187-
await Task.Delay(_settings.ComponentStatusPullInterval, cancellationToken);
191+
await Task.Delay(_settings.ComponentStatusPullInterval, cancellationToken).ConfigureAwait(false);
188192

189193
foreach (var component in _componentRegistryService.GetComponents())
190194
{
191195
foreach (var status in component.Status)
192196
{
193-
var componentStatusValue = new ComponentStatusValue
194-
{
195-
ComponentUid = component.Uid,
196-
StatusUid = status.Key,
197-
Value = Convert.ToString(status.Value, CultureInfo.InvariantCulture),
198-
Timestamp = DateTime.UtcNow
199-
};
200-
201-
_pendingComponentStatusValues.Add(componentStatusValue, cancellationToken);
197+
TryEnqueueComponentStatusValue(
198+
component.Uid,
199+
status.Key,
200+
status.Value,
201+
DateTime.UtcNow);
202202
}
203203
}
204204
}
@@ -211,5 +211,42 @@ private async Task TryUpdateComponentStatusValuesAsync(CancellationToken cancell
211211
}
212212
}
213213
}
214+
215+
private void TryEnqueueComponentStatusValue(
216+
string componentUid,
217+
string statusUid,
218+
object value,
219+
DateTime timestamp)
220+
{
221+
try
222+
{
223+
var stringValue = Convert.ToString(value, CultureInfo.InvariantCulture);
224+
225+
var roundSetting = _componentRegistryService.GetComponentSetting(componentUid, "history.round_digits");
226+
if (roundSetting != null)
227+
{
228+
var roundDigitsCount = Convert.ToInt32(roundSetting);
229+
if (decimal.TryParse(stringValue, out var @decimal))
230+
{
231+
@decimal = Math.Round(@decimal, roundDigitsCount);
232+
stringValue = Convert.ToString(@decimal, CultureInfo.InvariantCulture);
233+
}
234+
}
235+
236+
var componentStatusValue = new ComponentStatusValue
237+
{
238+
ComponentUid = componentUid,
239+
StatusUid = statusUid,
240+
Value = stringValue,
241+
Timestamp = timestamp
242+
};
243+
244+
_pendingComponentStatusValues.Add(componentStatusValue);
245+
}
246+
catch (Exception exception)
247+
{
248+
_logger.LogError(exception, $"Error while enque component status value '{componentUid}.{statusUid}'.");
249+
}
250+
}
214251
}
215252
}

‎Wirehome.Core/History/Repository/HistoryRepository.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class HistoryRepository
1313
// TODO: Consider caching the latest entries for fast comparison.
1414
//private readonly Dictionary<string, ComponentStatusValue> _latestComponentStatusValues = new Dictionary<string, ComponentStatusValue>();
1515

16-
public TimeSpan ComponentStatusPullInterval { get; set; } = TimeSpan.FromMinutes(5);
16+
public TimeSpan ComponentStatusOutdatedTimeout { get; set; } = TimeSpan.FromMinutes(6);
1717

1818
public void Initialize()
1919
{
@@ -69,7 +69,7 @@ public void UpdateComponentStatusValue(ComponentStatusValue componentStatusValue
6969
return;
7070
}
7171

72-
var latestIsOutdated = componentStatusValue.Timestamp - latestEntity.RangeEnd > ComponentStatusPullInterval;
72+
var latestIsOutdated = componentStatusValue.Timestamp - latestEntity.RangeEnd > ComponentStatusOutdatedTimeout;
7373
var valueHasChanged = string.CompareOrdinal(latestEntity.Value, componentStatusValue.Value) != 0;
7474

7575
if (valueHasChanged)

‎Wirehome.Tests/History/HistoryExtractTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class HistoryExtractTests
1111
public void HistoryExtract_Build_Simple()
1212
{
1313
var repo = HistoryRepositoryTests.CreateRepository();
14-
repo.ComponentStatusPullInterval = TimeSpan.FromHours(2);
14+
repo.ComponentStatusOutdatedTimeout = TimeSpan.FromHours(2);
1515
try
1616
{
1717
var startDateTime = DateTime.UtcNow;

‎Wirehome.Tests/History/HistoryRepositoryTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void ComponentStatusValue_Update_Existing()
7171
public void ComponentStatusValue_Create_New_Due_To_Outdated_Existing()
7272
{
7373
var repo = CreateRepository();
74-
repo.ComponentStatusPullInterval = TimeSpan.FromMinutes(1);
74+
repo.ComponentStatusOutdatedTimeout = TimeSpan.FromMinutes(1);
7575
try
7676
{
7777
var startDateTime = DateTime.UtcNow;
@@ -248,7 +248,7 @@ public void ComponentStatusValue_Load_Middle_Range()
248248
public void ComponentStatusValue_Build_Ranges()
249249
{
250250
var repo = CreateRepository();
251-
repo.ComponentStatusPullInterval = TimeSpan.FromHours(2);
251+
repo.ComponentStatusOutdatedTimeout = TimeSpan.FromHours(2);
252252
try
253253
{
254254
var startDateTime = DateTime.UtcNow;

0 commit comments

Comments
 (0)