wn/modbusmaster
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more logging

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2019-07-15 15:33:07 +01:00
parent 8c87460632
commit b7193d8d58
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/CmdServer.py
View File

@ -7,6 +7,7 @@ import datetime
import pickle import pickle
import sys import sys
import RegisterDatapoint import RegisterDatapoint
import logging
class CmdInterpreterException(ValueError): pass class CmdInterpreterException(ValueError): pass
@ -30,6 +31,7 @@ class CmdInterpreter(cmd.Cmd):
self.prompt = "test8> " self.prompt = "test8> "
self.intro = "test8 admin interface" self.intro = "test8 admin interface"
self.splitterRe = re.compile('\s+') self.splitterRe = re.compile('\s+')
self.logger = logging.getLogger('CmdInterpreter')
def __print(self, text): def __print(self, text):
self.stdout.write(text) self.stdout.write(text)
@ -307,7 +309,7 @@ class CmdInterpreter(cmd.Cmd):
self.__println("DO NOT FORGET TO SAVE AFTERWARDS!") self.__println("DO NOT FORGET TO SAVE AFTERWARDS!")
def do_save(self, arg): def do_save(self, arg):
self.__println(str(self.registers)) self.logger.warn(str(self.registers))
with open(self.config.registerFile, 'wb') as f: with open(self.config.registerFile, 'wb') as f:
pickle.dump(self.registers, f) pickle.dump(self.registers, f)
@ -340,13 +342,14 @@ class CmdInterpreter(cmd.Cmd):
class CmdHandle(socketserver.StreamRequestHandler): class CmdHandle(socketserver.StreamRequestHandler):
def handle(self): def handle(self):
logger = logging.getLogger('CmdHandle')
cmd = CmdInterpreter(io.TextIOWrapper(self.rfile), io.TextIOWrapper(self.wfile), self.server.userData.config, cmd = CmdInterpreter(io.TextIOWrapper(self.rfile), io.TextIOWrapper(self.wfile), self.server.userData.config,
self.server.userData.notifier, self.server.userData.registers) self.server.userData.notifier, self.server.userData.registers)
try: try:
cmd.cmdloop() cmd.cmdloop()
print("Cmd handle terminated") logger.info("Cmd handle terminated")
except ConnectionAbortedError as e: except ConnectionAbortedError as e:
print("Cmd handle externally interrupted") logger.info("Cmd handle externally interrupted")
class MyThreadingTCPServer(socketserver.ThreadingTCPServer): class MyThreadingTCPServer(socketserver.ThreadingTCPServer):
def __init__(self, host, handler, userData): def __init__(self, host, handler, userData):