Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit ab13ee25 由 LN
选项

json日志修改

1 个父辈 8c88b725
内嵌 并排
正在显示 5 个修改的文件 包含 62 行增加 和 3 行删除
source/ACSingleStore/20210701更新说明.txt 0 → 100644

20210701 增加json日志 打印，需要修改日志配置，ACSingleStoreL.exe文件，把log4net的配置用如下配置覆盖：
<log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
<file type="log4net.Util.PatternString" value="logs/Store-%property{fname}.log" />
<param name="Encoding" value="UTF-8" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<datePattern value="yyyy-MM-dd" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="[%date][%t]%-5p %m%n" />
</layout>
</appender>
<appender name="RunLog" type="log4net.Appender.RollingFileAppender">
<file type="log4net.Util.PatternString" value="logs/log/RunLog-%property{fname}.log" />
<param name="Encoding" value="UTF-8" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<datePattern value="yyyy-MM-dd" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value=" %m%n" />
</layout>
</appender>
<!--<root>
<level value="Info" />
<appender-ref ref="RollingLogFileAppender" />
</root>-->
<logger name="RollingLogFileAppender">
<level value="Info" />
<appender-ref ref="RollingLogFileAppender" />
</logger>
<logger name="RunLog">
<level value="Info" />
<appender-ref ref="RunLog" />
</logger>
</log4net>
\ No newline at end of file \ No newline at end of file
source/ACSingleStore/ACSingleStore.csproj
...@@ -176,6 +176,7 @@ ...@@ -176,6 +176,7 @@
<EmbeddedResource Include="ServoAxisInfo.resx"> <EmbeddedResource Include="ServoAxisInfo.resx">
<DependentUpon>ServoAxisInfo.cs</DependentUpon> <DependentUpon>ServoAxisInfo.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<Content Include="20210701更新说明.txt" />
<Content Include="Camera.json"> <Content Include="Camera.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
......
source/ACSingleStore/记录.txt
...@@ -68,7 +68,7 @@ StoreConfig.csv需要增加一行配置： ...@@ -68,7 +68,7 @@ StoreConfig.csv需要增加一行配置：
PRO,是否启用仓门口料盘检测信号,IsUse_Door_Check,1,,,,,,,,,,, PRO,是否启用仓门口料盘检测信号,IsUse_Door_Check,1,,,,,,,,,,,
20200628 增加json日志 打印，需要修改日志配置： 20200628 增加json日志 打印，需要修改日志配置，ACSingleStoreL.exe文件，把log4net的配置用如下配置覆盖：
<log4net> <log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender"> <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
......
source/Common/util/RunLogUtil.cs
...@@ -65,6 +65,11 @@ namespace OnlineStore.Common ...@@ -65,6 +65,11 @@ namespace OnlineStore.Common
} }
public ErrorLog(string deviceName, string errType, string errMsg, DateTime startTime, DateTime endTime, string operType = "", string posid = "", string barcode = "") public ErrorLog(string deviceName, string errType, string errMsg, DateTime startTime, DateTime endTime, string operType = "", string posid = "", string barcode = "")
{ {
if (errType == null) { errType = ""; }
if (errMsg == null) { errMsg = ""; }
if (operType == null) { operType = ""; }
if (posid == null) { posid = ""; }
if (barcode == null) { barcode = ""; }
this.LogType = "Error"; this.LogType = "Error";
this.DeviceName = deviceName.Trim(); this.DeviceName = deviceName.Trim();
this.ErrorType = errType.Trim(); this.ErrorType = errType.Trim();
...@@ -109,6 +114,9 @@ namespace OnlineStore.Common ...@@ -109,6 +114,9 @@ namespace OnlineStore.Common
} }
public MoveLog(string deviceName, string moveType, string moveMsg, DateTime startTime, DateTime endTime, string posid = "", string barcode = "") public MoveLog(string deviceName, string moveType, string moveMsg, DateTime startTime, DateTime endTime, string posid = "", string barcode = "")
{ {
if (moveMsg == null) { moveMsg = ""; }
if (posid == null) { posid = ""; }
if (barcode == null) { barcode = ""; }
this.LogType = "Running"; this.LogType = "Running";
this.DeviceName = deviceName.Replace("-Move", "").Replace("-SMove", "").Trim(); this.DeviceName = deviceName.Replace("-Move", "").Replace("-SMove", "").Trim();
this.MoveType = moveType.Trim(); this.MoveType = moveType.Trim();
...@@ -150,6 +158,8 @@ namespace OnlineStore.Common ...@@ -150,6 +158,8 @@ namespace OnlineStore.Common
} }
public InoutEndLog(string deviceName, string moveType, DateTime startTime, DateTime endTime, string posid = "", string barcode = "") public InoutEndLog(string deviceName, string moveType, DateTime startTime, DateTime endTime, string posid = "", string barcode = "")
{ {
if (posid == null) { posid = ""; }
if (barcode == null) { barcode = ""; }
this.LogType = "InoutEnd"; this.LogType = "InoutEnd";
this.DeviceName = deviceName.Replace("-Move", "").Replace("-SMove", "").Trim(); this.DeviceName = deviceName.Replace("-Move", "").Replace("-SMove", "").Trim();
this.MoveType = moveType.Trim(); this.MoveType = moveType.Trim();
...@@ -189,6 +199,9 @@ namespace OnlineStore.Common ...@@ -189,6 +199,9 @@ namespace OnlineStore.Common
} }
public AxisMoveLog(string deviceName, string axisName, string moveType, int targetP, int speed, DateTime startTime, DateTime endTime, string posid = "", string barcode = "") public AxisMoveLog(string deviceName, string axisName, string moveType, int targetP, int speed, DateTime startTime, DateTime endTime, string posid = "", string barcode = "")
{ {
if (moveType == null) { moveType = ""; }
if (posid == null) { posid = ""; }
if (barcode == null) { barcode = ""; }
this.LogType = "Axis"; this.LogType = "Axis";
this.DeviceName = deviceName.Replace("-Move", "").Replace("-SMove", "").Trim(); this.DeviceName = deviceName.Replace("-Move", "").Replace("-SMove", "").Trim();
this.MoveType = moveType.Trim(); this.MoveType = moveType.Trim();
......
source/DeviceLibrary/store/KTK_Store.cs
...@@ -507,6 +507,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -507,6 +507,8 @@ namespace OnlineStore.DeviceLibrary
/// <param name="logseconds"></param> /// <param name="logseconds"></param>
public void SetWarnMsg(string msg = "", string alarmType = "", StoreMoveInfo moveInfo = null, int logseconds = 10) public void SetWarnMsg(string msg = "", string alarmType = "", StoreMoveInfo moveInfo = null, int logseconds = 10)
{ {
try
{
int logtype = 801; int logtype = 801;
if (moveInfo != null) if (moveInfo != null)
{ {
...@@ -514,7 +516,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -514,7 +516,7 @@ namespace OnlineStore.DeviceLibrary
} }
if (String.IsNullOrEmpty(msg).Equals(false)) if (String.IsNullOrEmpty(msg).Equals(false))
{ {
if (WarnMsg.Equals(msg)) if (WarnMsg.Equals(msg) || alarmType.Equals(warnParam.AlarmType))
{ {
if (msg.StartsWith(StoreName)) if (msg.StartsWith(StoreName))
{ {
...@@ -561,7 +563,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -561,7 +563,11 @@ namespace OnlineStore.DeviceLibrary
warnParam.OperteType = ""; warnParam.OperteType = "";
} }
} }
}
catch (Exception ex)
{
LogUtil.error("SetWarnMsg Error: " + ex.ToString());
}
WarnMsg = msg; WarnMsg = msg;
warnParam.AlarmType = alarmType; warnParam.AlarmType = alarmType;
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!