支持输出平均TPS

Author: tangxuehua

src/Samples/QuickStart/QuickStart.ConsumerClient/Program.cs

@@ -22,7 +22,6 @@ static void Main(string[] args)
             Console.ReadLine();
         }
 
-        static ILogger _logger;
         static void InitializeEQueue()
         {
             ECommonConfiguration
@@ -33,7 +32,6 @@ static void InitializeEQueue()
                 .UseJsonNet()
                 .RegisterUnhandledExceptionHandler()
                 .RegisterEQueueComponents();
-            _logger = ObjectContainer.Resolve<ILoggerFactory>().Create("Program");
 
             var clientCount = int.Parse(ConfigurationManager.AppSettings["ClientCount"]);
             var consumerSetting = new ConsumerSetting
@@ -54,12 +52,17 @@ class MessageHandler : IMessageHandler
         {
             private long _previusHandledCount;
             private long _handledCount;
+            private long _calculateCount = 0;
             private IScheduleService _scheduleService;
+            private ILogger _logger;
+            private ILogger _throughputLogger;
 
             public MessageHandler()
             {
                 _scheduleService = ObjectContainer.Resolve<IScheduleService>();
                 _scheduleService.StartTask("Program.PrintThroughput", PrintThroughput, 1000, 1000);
+                _logger = ObjectContainer.Resolve<ILoggerFactory>().Create(typeof(Program).Name);
+                _throughputLogger = ObjectContainer.Resolve<ILoggerFactory>().Create("throughput");
             }
 
             public void Handle(QueueMessage message, IMessageContext context)
@@ -73,8 +76,19 @@ private void PrintThroughput()
                 var totalHandledCount = _handledCount;
                 var throughput = totalHandledCount - _previusHandledCount;
                 _previusHandledCount = totalHandledCount;
+                if (throughput > 0)
+                {
+                    _calculateCount++;
+                }
 
-                _logger.InfoFormat("totalReceived: {0}, throughput: {1}/s", totalHandledCount, throughput);
+                var average = 0L;
+                if (_calculateCount > 0)
+                {
+                    average = totalHandledCount / _calculateCount;
+                }
+
+                _logger.InfoFormat("totalReceived: {0}, throughput: {1}/s, average: {2}", totalHandledCount, throughput, average);
+                _throughputLogger.Info(throughput);
             }
         }
     }

src/Samples/QuickStart/QuickStart.ConsumerClient/log4net.config

@@ -10,11 +10,26 @@
       <param name="ConversionPattern" value="%date %5level %logger - %message%newline"/>
     </layout>
   </appender>
+  <appender name="throughputFile" type="log4net.Appender.RollingFileAppender,log4net">
+    <param name="File" value="logs/throughput.log"/>
+    <param name="AppendToFile" value="true"/>
+    <param name="RollingStyle" value="Date"/>
+    <param name="DatePattern" value="yyyy-MM-dd"/>
+    <param name="StaticLogFileName" value="true"/>
+    <param name="CountDirection" value="1"/>
+    <layout type="log4net.Layout.PatternLayout,log4net">
+      <param name="ConversionPattern" value="%message%newline"/>
+    </layout>
+  </appender>
   <appender name="console" type="log4net.Appender.ConsoleAppender">
     <layout type="log4net.Layout.PatternLayout">
       <conversionPattern value="%date %5level %logger - %message%newline" />
     </layout>
   </appender>
+  <logger name="throughput" additivity="false">
+    <level value="INFO" />
+    <appender-ref ref="throughputFile"/>
+  </logger>
   <root>
     <!--all priority options： OFF、FATAL、ERROR, WARN, INFO, DEBUG, ALL-->
     <priority value="INFO"/>

src/Samples/QuickStart/QuickStart.ProducerClient/Program.cs

@@ -23,9 +23,11 @@ class Program
     {
         static long _previousSentCount = 0;
         static long _sentCount = 0;
+        static long _calculateCount = 0;
         static string _mode;
         static bool _hasError;
         static ILogger _logger;
+        static ILogger _throughputLogger;
         static IScheduleService _scheduleService;
 
         static void Main(string[] args)
@@ -49,6 +51,7 @@ static void InitializeEQueue()
                 .SetDefault<IQueueSelector, QueueAverageSelector>();
 
             _logger = ObjectContainer.Resolve<ILoggerFactory>().Create(typeof(Program).Name);
+            _throughputLogger = ObjectContainer.Resolve<ILoggerFactory>().Create("throughput");
             _scheduleService = ObjectContainer.Resolve<IScheduleService>();
         }
         static void SendMessageTest()
@@ -163,8 +166,18 @@ static void PrintThroughput()
             var totalSentCount = _sentCount;
             var throughput = totalSentCount - _previousSentCount;
             _previousSentCount = totalSentCount;
+            if (throughput > 0)
+            {
+                _calculateCount++;
+            }
 
-            _logger.InfoFormat("Send message mode: {0}, totalSent: {1}, throughput: {2}/s", _mode, totalSentCount, throughput);
+            var average = 0L;
+            if (_calculateCount > 0)
+            {
+                average = totalSentCount / _calculateCount;
+            }
+            _logger.InfoFormat("Send message mode: {0}, totalSent: {1}, throughput: {2}/s, average: {3}", _mode, totalSentCount, throughput, average);
+            _throughputLogger.Info(throughput);
         }
 
         class ResponseHandler : IResponseHandler

src/Samples/QuickStart/QuickStart.ProducerClient/log4net.config

@@ -10,11 +10,26 @@
       <param name="ConversionPattern" value="%date %5level %logger - %message%newline"/>
     </layout>
   </appender>
+  <appender name="throughputFile" type="log4net.Appender.RollingFileAppender,log4net">
+    <param name="File" value="logs/throughput.log"/>
+    <param name="AppendToFile" value="true"/>
+    <param name="RollingStyle" value="Date"/>
+    <param name="DatePattern" value="yyyy-MM-dd"/>
+    <param name="StaticLogFileName" value="true"/>
+    <param name="CountDirection" value="1"/>
+    <layout type="log4net.Layout.PatternLayout,log4net">
+      <param name="ConversionPattern" value="%message%newline"/>
+    </layout>
+  </appender>
   <appender name="console" type="log4net.Appender.ConsoleAppender">
     <layout type="log4net.Layout.PatternLayout">
       <conversionPattern value="%date %5level %logger - %message%newline" />
     </layout>
   </appender>
+  <logger name="throughput" additivity="false">
+    <level value="INFO" />
+    <appender-ref ref="throughputFile"/>
+  </logger>
   <root>
     <!--all priority options： OFF、FATAL、ERROR, WARN, INFO, DEBUG, ALL-->
     <priority value="INFO"/>