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);

View File

@@ -2,7 +2,7 @@
<TimberWinR>
<Inputs>
<WindowsEvents>
<Events source="System,Application,Security" binaryFormat="PRINT" />
<Event source="System,Application,Security" binaryFormat="PRINT" />
</WindowsEvents>
<Logs>
<Log name="First Set" location="C:\Logs1\*.log" />

File diff suppressed because it is too large Load Diff

View File

@@ -23,9 +23,9 @@ namespace TimberWinR.Inputs
public class WindowsEvtInputListener : InputListener
{
private int _pollingIntervalInSeconds = 1;
private TimberWinR.Configuration.WindowsEvents _arguments;
private TimberWinR.Configuration.WindowsEvent _arguments;
public WindowsEvtInputListener(TimberWinR.Configuration.WindowsEvents arguments, CancellationToken cancelToken, int pollingIntervalInSeconds = 1)
public WindowsEvtInputListener(TimberWinR.Configuration.WindowsEvent arguments, CancellationToken cancelToken, int pollingIntervalInSeconds = 1)
: base(cancelToken)
{
_arguments = arguments;

View File

@@ -3,14 +3,14 @@
<Inputs>
<WindowsEvents>
<Events source="Application">
<Event source="Application">
<Fields>
<Field name="EventLog"/>
<Field name="RecordNumber"/>
</Fields>
</Events>
<Events source="System">
</Events>
</Event>
<Event source="System">
</Event>
</WindowsEvents>
<Logs>
<Log name="First Set" location="C:\Logs1\*.log">