luosheng/Modbus.Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2017-05-24 Update 2 Change verbose text.

Browse Source
This commit is contained in:
parallelbgls
2017-05-24 15:52:14 +08:00
parent c2bcdeac20
commit 81b15eb132
5 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modbus.Net/Modbus.Net.OPC/FBox/FBoxOpcDaManchine.cs
View File

@@ -17,7 +17,9 @@ namespace Modbus.Net.OPC.FBox
/// <param name="keepConnect">是否保持连接</param> /// <param name="keepConnect">是否保持连接</param>
public FBoxOpcDaMachine(string localSequence, string linkerName, public FBoxOpcDaMachine(string localSequence, string linkerName,
IEnumerable<AddressUnit> getAddresses, bool keepConnect) IEnumerable<AddressUnit> getAddresses, bool keepConnect)
: base(ConfigurationManager.AppSettings["FBoxOpcDaHost"], getAddresses, keepConnect) : base(
ConfigurationManager.AppSettings["FBoxOpcDaHost"] ?? "opcda://localhost/FBoxOpcServer", getAddresses,
keepConnect)
{ {
LocalSequence = localSequence; LocalSequence = localSequence;
LinkerName = linkerName; LinkerName = linkerName;

16
Modbus.Net/Modbus.Net/ComConnector.cs
View File

@@ -312,19 +312,19 @@ namespace Modbus.Net
private void RefreshSendCount() private void RefreshSendCount()
{ {
_sendCount++; _sendCount++;
Log.Verbose("Tcp client {ConnectionToken} send count: {SendCount}", ConnectionToken, _sendCount); Log.Verbose("Com client {ConnectionToken} send count: {SendCount}", ConnectionToken, _sendCount);
} }
private void RefreshReceiveCount() private void RefreshReceiveCount()
{ {
_receiveCount++; _receiveCount++;
Log.Verbose("Tcp client {ConnectionToken} receive count: {SendCount}", ConnectionToken, _receiveCount); Log.Verbose("Com client {ConnectionToken} receive count: {SendCount}", ConnectionToken, _receiveCount);
} }
private void RefreshErrorCount() private void RefreshErrorCount()
{ {
_errorCount++; _errorCount++;
Log.Verbose("Tcp client {ConnectionToken} error count: {ErrorCount}", ConnectionToken, _errorCount); Log.Verbose("Com client {ConnectionToken} error count: {ErrorCount}", ConnectionToken, _errorCount);
} }
#region 发送接收数据 #region 发送接收数据
@@ -458,7 +458,8 @@ namespace Modbus.Net
{ {
Log.Verbose("Com client {ConnectionToken} send msg length: {Length}", ConnectionToken, Log.Verbose("Com client {ConnectionToken} send msg length: {Length}", ConnectionToken,
sendbytes.Length); sendbytes.Length);
Log.Verbose("Com client {ConnectionToken} send msg: {SendBytes}", ConnectionToken, sendbytes); Log.Verbose(
$"Com client {ConnectionToken} send msg: {String.Concat(sendbytes.Select(p => " " + p))}");
SerialPort.Write(sendbytes, 0, sendbytes.Length); SerialPort.Write(sendbytes, 0, sendbytes.Length);
} }
catch (Exception err) catch (Exception err)
@@ -473,8 +474,8 @@ namespace Modbus.Net
returnBytes = ReadMsg(); returnBytes = ReadMsg();
Log.Verbose("Com client {ConnectionToken} receive msg length: {Length}", ConnectionToken, Log.Verbose("Com client {ConnectionToken} receive msg length: {Length}", ConnectionToken,
returnBytes.Length); returnBytes.Length);
Log.Verbose("Com client {ConnectionToken} receive msg: {SendBytes}", ConnectionToken, Log.Verbose(
returnBytes); $"Com client {ConnectionToken} receive msg: {String.Concat(returnBytes.Select(p => " " + p))}");
} }
catch (Exception e) catch (Exception e)
{ {
@@ -529,7 +530,8 @@ namespace Modbus.Net
{ {
Log.Verbose("Com client {ConnectionToken} send msg length: {Length}", ConnectionToken, Log.Verbose("Com client {ConnectionToken} send msg length: {Length}", ConnectionToken,
sendbytes.Length); sendbytes.Length);
Log.Verbose("Com client {ConnectionToken} send msg: {SendBytes}", ConnectionToken, sendbytes); Log.Verbose(
$"Com client {ConnectionToken} send msg: {string.Concat(sendbytes.Select(p => " " + p))}");
SerialPort.Write(sendbytes, 0, sendbytes.Length); SerialPort.Write(sendbytes, 0, sendbytes.Length);
} }
catch (Exception err) catch (Exception err)

18
Modbus.Net/src/Base.Common/TcpConnector.cs
View File

@@ -1,4 +1,5 @@
using System; using System;
using System.Linq;
using System.Net.Sockets; using System.Net.Sockets;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@@ -240,7 +241,7 @@ namespace Modbus.Net
var stream = _socketClient.GetStream(); var stream = _socketClient.GetStream();
Log.Verbose("Tcp client {ConnectionToken} send text len = {Length}", ConnectionToken, datagram.Length); Log.Verbose("Tcp client {ConnectionToken} send text len = {Length}", ConnectionToken, datagram.Length);
Log.Verbose("Tcp client {ConnectionToken} send text = {Datagram}", ConnectionToken, datagram); Log.Verbose($"Tcp client {ConnectionToken} send text = {String.Concat(datagram.Select(p => " " + p))}");
await stream.WriteAsync(datagram, 0, datagram.Length); await stream.WriteAsync(datagram, 0, datagram.Length);
RefreshSendCount(); RefreshSendCount();
@@ -281,16 +282,18 @@ namespace Modbus.Net
var stream = _socketClient.GetStream(); var stream = _socketClient.GetStream();
Log.Verbose("Tcp client {ConnectionToken} send text len = {Length}", ConnectionToken, datagram.Length);
Log.Verbose("Tcp client {ConnectionToken} send: {Datagram}", ConnectionToken, datagram);
await stream.WriteAsync(datagram, 0, datagram.Length);
RefreshSendCount(); RefreshSendCount();
Log.Verbose("Tcp client {ConnectionToken} send text len = {Length}", ConnectionToken, datagram.Length);
Log.Verbose($"Tcp client {ConnectionToken} send: {String.Concat(datagram.Select(p => " " + p))}");
await stream.WriteAsync(datagram, 0, datagram.Length);
var receiveBytes = await ReceiveAsync(stream); var receiveBytes = await ReceiveAsync(stream);
Log.Verbose("Tcp client {ConnectionToken} receive text len = {Length}", ConnectionToken, Log.Verbose("Tcp client {ConnectionToken} receive text len = {Length}", ConnectionToken,
receiveBytes.Length); receiveBytes.Length);
Log.Verbose("Tcp client {ConnectionToken} receive: {Datagram}", ConnectionToken, receiveBytes); Log.Verbose($"Tcp client {ConnectionToken} receive: {String.Concat(receiveBytes.Select(p => " " + p))}");
RefreshReceiveCount();
return receiveBytes; return receiveBytes;
} }
@@ -335,9 +338,6 @@ namespace Modbus.Net
var replyMessage = new byte[len]; var replyMessage = new byte[len];
Array.Copy(_receiveBuffer, replyMessage, len); Array.Copy(_receiveBuffer, replyMessage, len);
Log.Verbose("Tcp client {ConnectionToken} reply: {replyMessage}", ConnectionToken, replyMessage);
RefreshReceiveCount();
if (len <= 0) if (len <= 0)
RefreshErrorCount(); RefreshErrorCount();

6
Tests/Modbus.Net.Tests/App.config
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<appSettings>
<add key="FBoxOpcDaHost" value="opcda://localhost/FBoxOpcServer" />
</appSettings>
</configuration>

3
Tests/Modbus.Net.Tests/Modbus.Net.Tests.csproj
View File

@@ -79,9 +79,6 @@
<Name>Modbus.Net</Name> <Name>Modbus.Net</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<Choose> <Choose>
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'"> <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
<ItemGroup> <ItemGroup>