From 771aa791f1bfdea4e8e09a0b80df4d2b0e8845dd Mon Sep 17 00:00:00 2001 From: Eric Fontana Date: Mon, 22 Dec 2014 06:29:42 -0500 Subject: [PATCH] Fixed syncWait to use Milliseconds. --- TimberWinR.ServiceHost/Properties/AssemblyInfo.cs | 4 ++-- TimberWinR/Outputs/Elasticsearch.cs | 6 ++++-- TimberWinR/Outputs/Redis.cs | 2 +- TimberWinR/Outputs/Stdout.cs | 2 +- TimberWinR/Parser.cs | 2 +- TimberWix/Product.wxs | 6 +++--- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/TimberWinR.ServiceHost/Properties/AssemblyInfo.cs b/TimberWinR.ServiceHost/Properties/AssemblyInfo.cs index e2459c7..eec81fc 100644 --- a/TimberWinR.ServiceHost/Properties/AssemblyInfo.cs +++ b/TimberWinR.ServiceHost/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.3.17.0")] -[assembly: AssemblyFileVersion("1.3.17.0")] +[assembly: AssemblyVersion("1.3.18.0")] +[assembly: AssemblyFileVersion("1.3.18.0")] diff --git a/TimberWinR/Outputs/Elasticsearch.cs b/TimberWinR/Outputs/Elasticsearch.cs index 5e188ee..50a1c53 100644 --- a/TimberWinR/Outputs/Elasticsearch.cs +++ b/TimberWinR/Outputs/Elasticsearch.cs @@ -165,8 +165,10 @@ namespace TimberWinR.Outputs } GC.Collect(); if (!Stop) - syncHandle.Wait(TimeSpan.FromSeconds(_interval), CancelToken); - } + { + syncHandle.Wait(TimeSpan.FromMilliseconds(_interval), CancelToken); + } + } catch (OperationCanceledException oce) { break; diff --git a/TimberWinR/Outputs/Redis.cs b/TimberWinR/Outputs/Redis.cs index e4385f5..aab918d 100644 --- a/TimberWinR/Outputs/Redis.cs +++ b/TimberWinR/Outputs/Redis.cs @@ -255,7 +255,7 @@ namespace TimberWinR.Outputs } GC.Collect(); if (!Stop) - syncHandle.Wait(TimeSpan.FromSeconds(_interval), CancelToken); + syncHandle.Wait(TimeSpan.FromMilliseconds(_interval), CancelToken); } catch (OperationCanceledException oce) { diff --git a/TimberWinR/Outputs/Stdout.cs b/TimberWinR/Outputs/Stdout.cs index c0e7dfa..041e605 100644 --- a/TimberWinR/Outputs/Stdout.cs +++ b/TimberWinR/Outputs/Stdout.cs @@ -76,7 +76,7 @@ namespace TimberWinR.Outputs } } if (!Stop) - syncHandle.Wait(TimeSpan.FromSeconds(_interval), CancelToken); + syncHandle.Wait(TimeSpan.FromMilliseconds(_interval), CancelToken); } catch (OperationCanceledException oce) { diff --git a/TimberWinR/Parser.cs b/TimberWinR/Parser.cs index 3ebfd3d..98d4ca9 100644 --- a/TimberWinR/Parser.cs +++ b/TimberWinR/Parser.cs @@ -525,7 +525,7 @@ namespace TimberWinR.Parser Timeout = 10000; BatchCount = 10; NumThreads = 1; - Interval = 5000; + Interval = 5; QueueOverflowDiscardOldest = true; MaxQueueSize = 50000; } diff --git a/TimberWix/Product.wxs b/TimberWix/Product.wxs index 6f9ecb1..e7875c2 100644 --- a/TimberWix/Product.wxs +++ b/TimberWix/Product.wxs @@ -20,9 +20,9 @@ The 'd' means "reinstall if different". This ensures that, at the individual component level, rollbacks work correctly. See http://msdn.microsoft.com/en-us/library/windows/desktop/aa371182(v=vs.85).aspx --> - - - + + +