Skip to content

T
Thick-Common
Commit 738777ce authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

规范 nlog

parent 420c8b13
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 158 deletions
Project.FLY.ControlLibrary/FLY.ControlLibrary/FLY.ControlLibrary.csproj
View file @ 738777ce
......@@ -206,7 +206,7 @@
<Version>3.0.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf">
<Version>1.0.1</Version>
<Version>1.1.3</Version>
</PackageReference>
<PackageReference Include="MvvmLight">
<Version>5.4.1.1</Version>
......
Project.FLY.FObjSys/FObjSys/FObjBase.csproj
View file @ 738777ce
......@@ -70,10 +70,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.2</Version>
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="NLog">
<Version>4.6.6</Version>
<Version>4.6.8</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
......
Project.FLY.FObjSys/FObjSys/FObjSys.cs
View file @ 738777ce
......@@ -22,8 +22,7 @@ namespace FObjBase
/// <summary>
/// nlog调试信息
/// </summary>
static NLog.Logger loggerServer = NLog.LogManager.GetLogger("FObjSysOfServer");
static NLog.Logger loggerClient = NLog.LogManager.GetLogger("FObjSysOfClient");
static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
/// <summary>
/// 全局 当前正在操作的 fobj系统
/// </summary>
......@@ -121,9 +120,9 @@ namespace FObjBase
if (!(s1 is TCPCConn))
{
if (loggerServer.IsDebugEnabled)
if (logger.IsDebugEnabled)
{
loggerServer.Debug($"(S) SendMessageEx{Environment.NewLine}{Pack_ProtoToString(p)}");
logger.Debug($"(S) SendMessageEx{Environment.NewLine}{Pack_ProtoToString(p)}");
}
}
return;
......@@ -852,9 +851,9 @@ namespace FObjBase
void CConnConnectAction(IFConn conn)
{
TCPCConn cc = (TCPCConn)conn;
if (loggerClient.IsDebugEnabled)
if (logger.IsDebugEnabled)
{
loggerClient.Debug($"CConnConnectAction {cc.RemoteEP} conn.IsConnected={conn.IsConnected}");
logger.Debug($"(C) CConnConnectAction {cc.RemoteEP} conn.IsConnected={conn.IsConnected}");
}
KeyValuePair<TCPCConn, List<UInt32>> cc_kv;
......@@ -880,11 +879,11 @@ namespace FObjBase
/// <param name="conn"></param>
void SConnConnectAction(IFConn conn)
{
if (loggerServer.IsDebugEnabled)
if (logger.IsDebugEnabled)
{
if (conn is TCPConn)
{
loggerServer.Debug($"SConnConnectAction IsConnected={conn.IsConnected}");
{
logger.Debug($"(S) SConnConnectAction IsConnected={conn.IsConnected}");
}
}
......@@ -1082,9 +1081,9 @@ namespace FObjBase
return false;
if (loggerClient.IsDebugEnabled)
if (logger.IsDebugEnabled)
{
loggerClient.Debug($"(C) ParsePacketInClient {Environment.NewLine}{Pack_ProtoToString(p)}");
logger.Debug($"(C) ParsePacketInClient {Environment.NewLine}{Pack_ProtoToString(p)}");
}
......
Project.FLY.FObjSys/FObjSys/TCPConn.cs
View file @ 738777ce
......@@ -11,7 +11,7 @@ namespace FObjBase
public delegate bool ParsePacketHandler(byte[] packet, IFConn conn);
public class TCPConn:IFConn
{
static NLog.Logger logger = NLog.LogManager.GetLogger("tcp");
static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
public bool HasCRC = false;
TimeSpan Heartbeat_Interval = TimeSpan.FromSeconds(3); // heartbeat包发送间隔时间，3秒
......@@ -56,8 +56,7 @@ namespace FObjBase
{
//包太大，不正常！！！！！！
//断开重新连接
if (logger.IsErrorEnabled)
logger.Error("TCPConn GetRecvInfoPacket 包太大，不正常, 断开重新连接");
logger.Error("TCPConn GetRecvInfoPacket 包太大，不正常, 断开重新连接");
sock.Close();
return -1;
......@@ -75,8 +74,7 @@ namespace FObjBase
UInt16 packet_crc = BitConverter.ToUInt16(in_buffer.GetRange(packet_crc_idx, 2).ToArray(), 0);
if (crc != packet_crc)
{
if (logger.IsErrorEnabled)
logger.Error("TCPConn GetRecvInfoPacket CRC != packet_crc 断开重新连接");
logger.Error("TCPConn GetRecvInfoPacket CRC != packet_crc 断开重新连接");
//断开重新连接
sock.Close();
return -1;
......@@ -171,8 +169,7 @@ namespace FObjBase
//FDEBUG.Debug.LogMessage(this, 10, "Receive_Poll e=" + e.ToString());
if (reclen_total == 0)
{
if (logger.IsErrorEnabled)
logger.Error(e,"TCPConn Receive_Poll 什么都收不到");
logger.Debug(e,"TCPConn Receive_Poll 什么都收不到");
return -1;
}
else
......@@ -192,8 +189,7 @@ namespace FObjBase
//FDEBUG.Debug.LogMessage(this, 10, "Receive_Poll e=" + e.ToString());
if (reclen_total == 0)
{
if (logger.IsErrorEnabled)
logger.Error(e, "TCPConn Receive_Poll 什么都收不到");
logger.Debug(e, "TCPConn Receive_Poll 什么都收不到");
return -1;
}
else
......@@ -232,8 +228,7 @@ namespace FObjBase
{
if ((DateTime.Now-comm_time) > Silent_Time)
{
if (logger.IsErrorEnabled)
logger.Error("TCPConn OnPoll 长时间没收到任何数据 断开连接");
logger.Error("TCPConn OnPoll 长时间没收到任何数据 断开连接");
ret = -2;
goto end;
......@@ -271,8 +266,7 @@ namespace FObjBase
if (ret != 0)
{
//连接断开,清空接收缓存区
if (logger.IsErrorEnabled)
logger.Error("TCPConn OnPoll 连接断开,清空接收缓存区");
logger.Error("TCPConn OnPoll 连接断开,清空接收缓存区");
in_buffer.Clear();
out_buffer.Clear();
......
Project.FLY.Misc/MISC/Log.cs deleted 100644 → 0
View file @ 420c8b13
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.IO;
namespace Misc
{
/// <summary>
/// 保存调试信息
/// </summary>
public class Log
{
/// <summary>
/// 当前级别限制
/// </summary>
public static int Level=0;
static Log()
{
ReadLv();
}
static void ReadLv()
{
try
{
StreamReader sr = new StreamReader("logparam.txt", Encoding.GetEncoding("GB2312"));
string s = sr.ReadLine();
int level = 0;
if (int.TryParse(s, out level))
{
Level = level;
}
sr.Close();
}
catch
{
}
}
static bool SaveLv()
{
try{
StreamWriter sw = new StreamWriter("logparam.txt", false, Encoding.GetEncoding("GB2312"));
sw.WriteLine(Level.ToString());
sw.Flush();
sw.Close();
return true;
}
catch
{
return false;
}
}
/// <summary>
/// 设置级别限制
/// </summary>
/// <param name="level"></param>
/// <returns></returns>
public static bool SetLv(int level)
{
Level = level;
return SaveLv();
}
/// <summary>
/// 输出调试信息
/// </summary>
/// <param name="logClass"></param>
/// <param name="level"></param>
/// <param name="format"></param>
/// <param name="args"></param>
public static void LogMessage(string logClass, int level, string format, params object[] args)
{
if( level > Level )
return;
//以附加的方式打开只写文件。
//若文件不存在，则会建立该文件，
//如果文件存在，写入的数据会被加到文件尾，即文件原先的内容会被保留。
StreamWriter sw = new StreamWriter("log.txt", true, Encoding.GetEncoding("GB2312"));
string time_str = DateTime.Now.ToString();
sw.Write(time_str + ",");
sw.Write(level.ToString() +",");
sw.Write( logClass.ToString()+",");
sw.WriteLine(format, args);
sw.Flush();
sw.Close();
}
/// <summary>
/// 输出调试信息
/// </summary>
/// <param name="logClass"></param>
/// <param name="level"></param>
/// <param name="format"></param>
/// <param name="args"></param>
public static void LogMessage(string logClass, int level, string format)
{
if (level > Level)
return;
//以附加的方式打开只写文件。
//若文件不存在，则会建立该文件，
//如果文件存在，写入的数据会被加到文件尾，即文件原先的内容会被保留。
StreamWriter sw = new StreamWriter("log.txt", true, Encoding.GetEncoding("GB2312"));
string time_str = DateTime.Now.ToString();
sw.Write(time_str + ",");
sw.Write(level.ToString() + ",");
sw.Write(logClass.ToString() + ",");
sw.WriteLine(format);
sw.Flush();
sw.Close();
}
}
}
Project.FLY.Misc/MISC/Misc.csproj
View file @ 738777ce
......@@ -82,7 +82,6 @@
<Compile Include="DATARANGE.cs" />
<Compile Include="Enumerable.cs" />
<Compile Include="IgnoreAttribute.cs" />
<Compile Include="Log.cs" />
<Compile Include="PropertiesManager.cs" />
<Compile Include="PropertyBinding.cs" />
<Compile Include="Range.cs" />
......@@ -128,7 +127,7 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.2</Version>
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="PropertyChanged.Fody">
<Version>2.6.1</Version>
......
Project.FLY.OBJComponents/OBJComponents/OBJComponents.csproj
View file @ 738777ce
......@@ -109,7 +109,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.2</Version>
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="PropertyChanged.Fody">
<Version>2.6.1</Version>
......
Project.FLY.Thick.Base/FLY.Thick.Base/FLY.Thick.Base.csproj
View file @ 738777ce
......@@ -204,7 +204,7 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.2</Version>
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="PropertyChanged.Fody">
<Version>2.6.1</Version>
......
Project.FLY.Thick.Base/FLY.Thick.Base/Server/SysParam.cs
View file @ 738777ce
......@@ -38,10 +38,6 @@ namespace FLY.Thick.Base.Server
/// </summary>
public int FLYAD7_GridSmooth { get; set; } = 0;
/// <summary>
/// 数据库地址，只读，界面没法修改
/// </summary>
public string DBPath { get; set; } = @"D:\flydata\thick_history.sqlite3";
#endregion
private string param_path = "sysparam.xml";
......
Project.SQLiteHelper/SQLiteHelper/SQLiteHelper.cs
View file @ 738777ce
......@@ -15,7 +15,7 @@ namespace SQLite
{
public class SQLiteHelper
{
static NLog.Logger logger = NLog.LogManager.GetLogger("sqlite");
static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
#region 静态操作
public class SQLiteFieldTypeInfo
{
......@@ -599,7 +599,7 @@ namespace SQLite
{
tran.Rollback();
check = false;
logger.Fatal(ex, Newtonsoft.Json.JsonConvert.SerializeObject(queryList));
logger.Error(ex, Newtonsoft.Json.JsonConvert.SerializeObject(queryList));
throw ex;
}
finally
......
Project.SQLiteHelper/SQLiteHelper/SQLiteHelper.csproj
View file @ 738777ce
......@@ -57,13 +57,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.2</Version>
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="NLog">
<Version>4.6.7</Version>
<Version>4.6.8</Version>
</PackageReference>
<PackageReference Include="System.Data.SQLite">
<Version>1.0.111</Version>
<Version>1.0.112</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment