Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 07:19:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-200532: Fix "dom0 memory alerts turns on continuous dom0 file system alerts"

Browse Source
This commit is contained in:
Stephen Turner 2016-02-26 16:36:27 +00:00
parent 3073fd071d
commit e67f6c4eb5
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
XenModel/Alerts/PerfmonDefinition.cs
View File

@ -179,6 +179,7 @@ namespace XenAdmin.Alerts
else if (node.Name.Equals(ALARM_TYPE_ELEMENT_NAME)) else if (node.Name.Equals(ALARM_TYPE_ELEMENT_NAME))
{ {
name = node.Attributes[ALARM_COMMON_ATTR_NAME].Value; name = node.Attributes[ALARM_COMMON_ATTR_NAME].Value;
success = true;
} }
else if (node.Name.Equals(ALARM_TRIGGER_LEVEL_ELEMENT_NAME)) else if (node.Name.Equals(ALARM_TRIGGER_LEVEL_ELEMENT_NAME))
{ {
@ -264,14 +265,10 @@ namespace XenAdmin.Alerts
List<PerfmonDefinition> perfmonDefinitions = new List<PerfmonDefinition>(); List<PerfmonDefinition> perfmonDefinitions = new List<PerfmonDefinition>();
foreach (XmlNode node in parentNode.ChildNodes) foreach (XmlNode node in parentNode.ChildNodes)
try
{ {
perfmonDefinitions.Add(new PerfmonDefinition(node)); var def = new PerfmonDefinition(node);
} if (def.HasValueSet)
catch (Exception e) perfmonDefinitions.Add(def);
{
log.DebugFormat("Exception unmarshalling perfmon definition '{0}'", node.OuterXml);
log.Debug(e, e);
} }
return perfmonDefinitions.ToArray(); return perfmonDefinitions.ToArray();