Skip to content

Commit 0776089

Browse files
Stability fixes
Monitors without acceleration info failed - fixed Enums on object type overflowing with int32, fixed
1 parent 3338fde commit 0776089

File tree

2 files changed

+26
-24
lines changed

2 files changed

+26
-24
lines changed

DataObjects/ObsMonitor.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,8 @@ public void AddAccelerationInfo(Dictionary<string, ObsDataset> allDatasetsDict,
340340
this.Acceleration = new ObsAccelerationInfo(accelerationInfoObject, this, allDatasetsDict, allMonitorsDict);
341341
}
342342
}
343+
344+
if (this.Acceleration == null) this.Acceleration = new ObsAccelerationInfo();
343345
}
344346

345347
public List<ObjectRelationship> GetRelationshipsOfRelated(ObsStage interestingObject)

DataObjects/base/ObsCompositeObjectType.cs

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,35 @@ public enum ObsCompositeObjectType
55
{
66
Unknown = 0,
77

8-
Dashboard = 1 << 2,
8+
Dashboard = 1 << 1,
99

10-
Worksheet = 1 << 4,
10+
Worksheet = 1 << 2,
1111

12-
Monitor = 1 << 5,
13-
MetricThresholdMonitor = 1 << 6,
14-
LogThresholdMonitor = 1 << 7,
15-
ResourceCountThresholdMonitor = 1 << 8,
16-
PromotionMonitor = 1 << 9,
17-
ResourceTextValueMonitor = 1 << 10,
12+
Monitor = 1 << 3,
13+
MetricThresholdMonitor = 1 << 4,
14+
LogThresholdMonitor = 1 << 5,
15+
ResourceCountThresholdMonitor = 1 << 6,
16+
PromotionMonitor = 1 << 7,
17+
ResourceTextValueMonitor = 1 << 8,
1818

19-
Monitor2 = 1 << 11,
19+
Monitor2 = 1 << 9,
2020

21-
Dataset = 1 << 16,
22-
DatastreamDataset = 1 << 17,
23-
EventDataset = 1 << 18,
24-
ResourceDataset = 1 << 19,
25-
IntervalDataset = 1 << 20,
26-
TableDataset = 1 << 21,
27-
MetricSMADataset = 1 << 22,
28-
MonitorSupportDataset = 1 << 23,
29-
InterfaceMetricDataset = 1 << 24,
30-
InterfaceLogDataset = 1 << 25,
21+
Dataset = 1 << 10,
22+
DatastreamDataset = 1 << 11,
23+
EventDataset = 1 << 12,
24+
ResourceDataset = 1 << 13,
25+
IntervalDataset = 1 << 14,
26+
TableDataset = 1 << 15,
27+
MetricSMADataset = 1 << 16,
28+
MonitorSupportDataset = 1 << 17,
29+
InterfaceMetricDataset = 1 << 18,
30+
InterfaceLogDataset = 1 << 19,
3131

32-
Datastream = 1 << 30,
33-
Token = 1 << 31,
34-
IngestToken = 1 << 32,
35-
PollerToken = 1 << 33,
36-
FiledropToken = 1 << 34,
32+
Datastream = 1 << 20,
33+
Token = 1 << 21,
34+
IngestToken = 1 << 22,
35+
PollerToken = 1 << 23,
36+
FiledropToken = 1 << 24,
3737

3838
}
3939
}

0 commit comments

Comments
 (0)