Fix performance issue where receive a very long log message in debug …

…version.
alanthinker · Mar 19, 2019 · 416ec27 · 416ec27
1 parent 8cb243f
commit 416ec27
Show file tree

Hide file tree

Showing 6 changed files with 99 additions and 87 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,22 +1,22 @@
-[Bb]in/
-[Oo]bj/
-[Ww]orking*/
-Build/runbuild.txt
-Doc/doc.shfbproj_*
-TestResults/
-AppPackages/
-*.suo
-*.user
-*.userprefs
-_ReSharper.*
-*.ReSharper.user
-*.resharper.user
-project.lock.json
-*.xproj
-.vs/
-*.props
-*.targets
-
-#NuGet
-packages
+[Bb]in/
+[Oo]bj/
+[Ww]orking*/
+Build/runbuild.txt
+Doc/doc.shfbproj_*
+TestResults/
+AppPackages/
+*.suo
+*.user
+*.userprefs
+_ReSharper.*
+*.ReSharper.user
+*.resharper.user
+project.lock.json
+*.xproj
+.vs/
+*.props
+*.targets
+
+#NuGet
+packages
 !packages/repositories.config
diff --git a/src/Log2Window/Properties/AssemblyInfo.cs b/src/Log2Window/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyVersion("2.1.3.0")]
 
diff --git a/src/Log2Window/Receiver/TcpReceiver.cs b/src/Log2Window/Receiver/TcpReceiver.cs
@@ -150,8 +150,7 @@ void ProcessReceivedData(object newSocket)
                             while (_socket != null
                                 && (temp = sr.Read()) != -1)
                             {
-                                sb.Append((char)temp);
-                                var str2 = sb.ToString();
+                                sb.Append((char)temp); 
                                 if (IsEndWith(sb, log4jEndTag))
                                 {
                                     var str = sb.ToString();

diff --git a/src/TestLog4net/Program.cs b/src/TestLog4net/Program.cs
@@ -37,15 +37,13 @@ static void Main(string[] args)
             ////    EventLog.CreateEventSource("log4net", "Application");
             ////}
 
-            ConsoleKeyInfo key = new ConsoleKeyInfo();
-            while (key.Key != ConsoleKey.X)
-            {
-
-                DoLog(key.KeyChar);
-
+            string cmd = Console.ReadLine();
+            while ("" != cmd)
+            { 
+                DoLog(cmd); 
 
                 DoWinDebug();
-                key = Console.ReadKey();
+                cmd = Console.ReadLine();
             }
         }
 
@@ -79,18 +77,26 @@ static void DoWinDebug()
             //Console.WriteLine("End Doing WinDebug!");
         }
 
-        static void DoLog(char keyChar)
+        static void DoLog(string cmd)
         {
             Console.WriteLine("\nBegin Doing Log!");
             Console.WriteLine(DateTime.Now);
-            if (Char.ToLower(keyChar) == 'b')
+            if (cmd.ToLower() == "b")
             {
                 for (int i = 0; i < 1000000; i++)
                 {
                     _log.Info(i);
                 }
             }
-            else if (Char.ToLower(keyChar) == 't')
+            if (cmd.ToLower() == "b2")
+            {
+                string data = File.ReadAllText(@"d:\Projects\github\Log2Window\src\TestLog4net\testDatas.txt");
+                for (int i = 0; i < 100; i++)
+                {
+                    _log.Info(i+" "+ data);
+                }
+            }
+            else if (cmd.ToLower() == "t")
             {
                 for (int i = 0; i < 10; i++)
                 {
@@ -104,11 +110,11 @@ static void DoLog(char keyChar)
                     }, log);
                 }
             }
-            else if (keyChar >= '1' && keyChar <= '9')
+            else if (cmd[0] >= '1' && cmd[0] <= '9')
             {
-                _log.Info(keyChar);
+                _log.Info(cmd);
             }
-            else if (Char.ToLower(keyChar) == 'e')
+            else if (cmd.ToLower()  == "e")
             {
                 try
                 {
@@ -120,7 +126,7 @@ static void DoLog(char keyChar)
                     _log.Error("TestEx", ex);
                 }
             }
-            else if (Char.ToLower(keyChar) == 'c')
+            else if (cmd.ToLower()  == "c")
             {
                 for (int i = 0; i < 10; i++)
                 {

diff --git a/src/TestLog4net/TestLog4net.csproj b/src/TestLog4net/TestLog4net.csproj
@@ -100,6 +100,9 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="testDatas.txt" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/src/script_Publish.sh b/src/script_Publish.sh
@@ -1,50 +1,54 @@
-
-####################### 引用common #######################  
-source "D:/Projects/XxcProjects/ShellScript/common.sh"
-
-####################### 初始化 #######################  
-	# 当前目录被定义在 $startScriptDir 中
-alanInit
-mydir=$startScriptDir
-
-#######################        #######################   
-if [ "$msbuild" == "" ] ; then
-	showErrorAndExit "系统环境变量msbuild必须设置到MSBuild.exe的路径" 
-fi  
-
-rm -rf d:/temp/Log2Window
-checkIfActionError "清空目录出错 $LINENO"  
-rm -f d:/temp/Log2Window.zip
-checkIfActionError "删除文件出错 $LINENO"  
-
-mkdir -p d:/temp/Log2Window
-mkdir -p d:/temp/Log2Window/ExampleProject
-"$msbuild"  \
-    //t:rebuild \
-	/property:OutputPath=d:/temp/Log2Window \
-	/property:Configuration=Debug \
-	/property:DeployOnBuild=true \
-	"Log2Window\Log2Window.csproj"
-checkIfActionError "编译出错" 
-
-cp -rf TestLog4net d:/temp/Log2Window/ExampleProject
-checkIfActionError "出错 $LINENO" 
-cp -rf TestNLog d:/temp/Log2Window/ExampleProject
-checkIfActionError "出错 $LINENO" 
-
-find d:/temp/Log2Window/ExampleProject -name "bin" -exec rm -rf {} \;
-find d:/temp/Log2Window/ExampleProject -name "obj" -exec rm -rf {} \;
-find d:/temp/Log2Window/ExampleProject -name "packages" -exec rm -rf {} \;   
-
-mkdir d:/temp/Log2Window/bin
-mv d:/temp/Log2Window/*.dll d:/temp/Log2Window/bin
-mv d:/temp/Log2Window/*.xml d:/temp/Log2Window/bin
-
-cd d:/temp
-zip -r Log2Window.zip Log2Window
-checkIfActionError "压缩出错" 
-cp -af d:/temp/Log2Window/. "D:/Users/Alan/Documents/YunPan/Program Files/Log2Window" 
-checkIfActionError "出错 $LINENO" 
-showInfo 全部完成.
-
+
+####################### 引用common #######################  
+source "/mnt/d/Projects/XxcProjects/ShellScript/common.sh"
+
+####################### 初始化 #######################  
+	# 当前目录被定义在 $startScriptDir 中
+alanInit
+mydir=$startScriptDir
+
+#######################        #######################   
+readVarFromNT msbuild
+toBashPath msbuild
+"$msbuild"
+
+if [ "$msbuild" == "" ] ; then
+	showErrorAndExit "系统环境变量msbuild必须设置到MSBuild.exe的路径" 
+fi  
+
+rm -rf /mnt/d/temp/Log2Window
+checkIfActionError "清空目录出错 $LINENO"  
+rm -f /mnt/d/temp/Log2Window.zip
+checkIfActionError "删除文件出错 $LINENO"  
+
+mkdir -p /mnt/d/temp/Log2Window
+mkdir -p /mnt/d/temp/Log2Window/ExampleProject
+"$msbuild"  \
+    /t:rebuild \
+	/property:OutputPath=d:/temp/Log2Window \
+	/property:Configuration=Release \
+	/property:DeployOnBuild=true \
+	"Log2Window\Log2Window.csproj"
+checkIfActionError "编译出错" 
+
+cp -rf TestLog4net /mnt/d/temp/Log2Window/ExampleProject
+checkIfActionError "出错 $LINENO" 
+cp -rf TestNLog /mnt/d/temp/Log2Window/ExampleProject
+checkIfActionError "出错 $LINENO" 
+
+find /mnt/d/temp/Log2Window/ExampleProject -name "bin" -exec rm -rf {} \;
+find /mnt/d/temp/Log2Window/ExampleProject -name "obj" -exec rm -rf {} \;
+find /mnt/d/temp/Log2Window/ExampleProject -name "packages" -exec rm -rf {} \;   
+
+mkdir /mnt/d/temp/Log2Window/bin
+mv /mnt/d/temp/Log2Window/*.dll /mnt/d/temp/Log2Window/bin
+mv /mnt/d/temp/Log2Window/*.xml /mnt/d/temp/Log2Window/bin
+
+cd /mnt/d/temp
+zip -r Log2Window.zip Log2Window
+checkIfActionError "压缩出错" 
+cp -af /mnt/d/temp/Log2Window/. "/mnt/d/Users/Alan/Documents/YunPan/Program Files/Log2Window" 
+checkIfActionError "出错 $LINENO" 
+showInfo 全部完成.
+
 read temp