github-mirrors/pyPLC
1
0
Fork 0
mirror of https://github.com/uhi22/pyPLC.git synced 2024-11-10 01:05:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tidy-up of logging

Browse source
This commit is contained in:
uhi22 2023-03-03 10:43:33 +01:00
parent 578bce9811
commit 1b5434bda8
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pyPlcHomeplug.py
View file

@ -1072,9 +1072,7 @@ class pyPlcHomeplug():
self.ipv6 = pyPlcIpv6.ipv6handler(self.transmit, self.addressManager) self.ipv6 = pyPlcIpv6.ipv6handler(self.transmit, self.addressManager)
self.ipv6.ownMac = self.myMAC self.ipv6.ownMac = self.myMAC
self.udplog = udplog.udplog(self.transmit, self.addressManager) self.udplog = udplog.udplog(self.transmit, self.addressManager)
for k in range(0, 10): self.udplog.log("Test message to verify the syslog. pyPlcHomeplug.py is in the init function.")
self.udplog.log("Test message number " + str(k))
time.sleep(0.1)
if (mode == C_LISTEN_MODE): if (mode == C_LISTEN_MODE):
self.enterListenMode() self.enterListenMode()
if (mode == C_EVSE_MODE): if (mode == C_EVSE_MODE):

14
pyPlcTcpSocket.py
View file

@ -32,13 +32,13 @@ class pyPlcTcpClientSocket():
def connect(self, host, port): def connect(self, host, port):
try: try:
self.addToTrace("connecting to " + str(host) + " port " + str(port) + "...") self.addToTrace("TCP connecting to " + str(host) + " port " + str(port) + "...")
# for connecting, we are still in blocking-mode because # for connecting, we are still in blocking-mode because
# otherwise we run into error "[Errno 10035] A non-blocking socket operation could not be completed immediately" # otherwise we run into error "[Errno 10035] A non-blocking socket operation could not be completed immediately"
# We set a shorter timeout, so we do not block too long if the connection is not established: # We set a shorter timeout, so we do not block too long if the connection is not established:
print("step1") #print("step1")
self.sock.settimeout(0.5) self.sock.settimeout(0.5)
print("step2") #print("step2")
# https://stackoverflow.com/questions/71022092/python3-socket-program-udp-ipv6-bind-function-with-link-local-ip-address-gi # https://stackoverflow.com/questions/71022092/python3-socket-program-udp-ipv6-bind-function-with-link-local-ip-address-gi
# While on Windows10 just connecting to a remote link-local-address works, under # While on Windows10 just connecting to a remote link-local-address works, under
@ -56,18 +56,18 @@ class pyPlcTcpClientSocket():
socket_addr = socket.getaddrinfo(host,port,socket.AF_INET6,socket.SOCK_DGRAM,socket.SOL_UDP)[0][4] socket_addr = socket.getaddrinfo(host,port,socket.AF_INET6,socket.SOCK_DGRAM,socket.SOL_UDP)[0][4]
#print(socket_addr) #print(socket_addr)
print("step2b") #print("step2b")
# https://stackoverflow.com/questions/5358021/establishing-an-ipv6-connection-using-sockets-in-python # https://stackoverflow.com/questions/5358021/establishing-an-ipv6-connection-using-sockets-in-python
# (address, port, flow info, scope id) 4-tuple for AF_INET6 # (address, port, flow info, scope id) 4-tuple for AF_INET6
# On Raspberry, the ScopeId is important. Just giving 0 leads to "invalid argument" in case # On Raspberry, the ScopeId is important. Just giving 0 leads to "invalid argument" in case
# of link-local ip-address. # of link-local ip-address.
#self.sock.connect((host, port, 0, 0)) #self.sock.connect((host, port, 0, 0))
self.sock.connect(socket_addr) self.sock.connect(socket_addr)
print("step3") #print("step3")
self.sock.setblocking(0) # make this socket non-blocking, so that the recv function will immediately return self.sock.setblocking(0) # make this socket non-blocking, so that the recv function will immediately return
self.isConnected = True self.isConnected = True
except socket.error as e: except socket.error as e:
self.addToTrace("connection failed" + str(e)) self.addToTrace("TCP connection failed" + str(e))
self.isConnected = False self.isConnected = False
def disconnect(self): def disconnect(self):
@ -101,7 +101,7 @@ class pyPlcTcpClientSocket():
sent = self.sock.send(msg[totalsent:]) sent = self.sock.send(msg[totalsent:])
if sent == 0: if sent == 0:
self.isConnected = False self.isConnected = False
self.addToTrace("socket connection broken") self.addToTrace("TCP socket connection broken")
return -1 return -1
totalsent = totalsent + sent totalsent = totalsent + sent
except: except: