Skip to content

Commit

Permalink
More ccnet logging
Browse files Browse the repository at this point in the history
  • Loading branch information
lprichar committed Jun 19, 2014
1 parent 550447c commit 69831d5
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions CruiseControlNetServices/CruiseControlNetBuildStatus.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
using System.Linq;
using System.Text.RegularExpressions;
using System.Xml.Linq;
using log4net;
using SirenOfShame.Lib;
using SirenOfShame.Lib.Helpers;
using SirenOfShame.Lib.Watcher;

Expand Down Expand Up @@ -36,6 +38,7 @@ namespace CruiseControlNetServices
public class CruiseControlNetBuildStatus : BuildStatus
{
private static readonly Dictionary<string, BuildStatusInfo> _buildStatusInfo = new Dictionary<string, BuildStatusInfo>();
private readonly ILog _log = MyLogManager.GetLogger(typeof (CruiseControlNetBuildStatus));

public static string ParseCruiseControlDateToId(string date)
{
Expand Down Expand Up @@ -67,7 +70,7 @@ public CruiseControlNetBuildStatus(XElement projectElem, XElement modifications)
BuildStatusEnum = ToBuildStatusEnum(projectElem.AttributeValueOrDefault("activity"), projectElem.AttributeValueOrDefault("lastBuildStatus"));
StartedTime = GetStartedTime(buildStatusInfo, BuildStatusEnum, lastBuildTime);
FinishedTime = GetFinishedTime(buildStatusInfo, BuildStatusEnum, lastBuildTime);
Comment = GetComment(projectElem, modifications);
Comment = GetComment(modifications);
RequestedBy = GetRequestedBy(projectElem, modifications);

var webUrl = projectElem.AttributeValueOrDefault("webUrl");
Expand Down Expand Up @@ -97,7 +100,7 @@ private string GetBuildIdOrDefault(XElement projectElem, string defaultVal)
return lastBuildLabel;
}

private string GetComment(XElement projectElem, XElement modifications)
private string GetComment(XElement modifications)
{
try
{
Expand All @@ -123,9 +126,9 @@ private string GetComment(XElement projectElem, XElement modifications)
return commentToReturn;
}
}
catch (Exception)
catch (Exception ex)
{
// Swallow and return null
_log.Warn("Unable to retrieve comment", ex);
return null;
}

Expand All @@ -147,9 +150,9 @@ private string GetRequestedBy(XElement projectElem, XElement modifications)
}
}
}
catch (Exception)
catch (Exception ex)
{
// Swallow and return null
_log.Error("Unable to retrieve requested by", ex);
return null;
}

Expand Down

0 comments on commit 69831d5

Please sign in to comment.