Merge remote-tracking branch 'origin/master'

Conflicts:
	TimberWinR/Configuration.cs
This commit is contained in:
Eric Fontana
2014-07-18 07:25:42 -04:00
parent e5795a0718
commit eb7fa8bffe
5 changed files with 660 additions and 144 deletions

View File

@@ -94,7 +94,7 @@ namespace TimberWinR.ServiceHost
_nlogListener = new TcpInputListener(_cancellationToken, 5140);
outputRedis.Connect(_nlogListener);
foreach (Configuration.WindowsEvents eventConfig in manager.Config.Events)
foreach (Configuration.WindowsEvent eventConfig in manager.Config.Events)
{
var elistner = new WindowsEvtInputListener(eventConfig, _cancellationToken);
outputRedis.Connect(elistner);