gemian-fixes/codi-app
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved file based logging to /tmp and only when the user requests it with a -d, removed common error logging so it wont interfeer with progress bar

Browse source
This commit is contained in:
Adam Boardman 2020-12-17 15:42:27 +00:00
parent bfeb204226
commit 8ab237b83b
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
codi-app/codiUpdate.py
View file

@ -135,7 +135,6 @@ def send_file(file):
SerialPortManager.sendCommand(writeString("1"))
time.sleep(1)
logging.basicConfig(filename='ymodem.log', level=logging.DEBUG)
ser = SerialPortManager.getSocket()
modem = YMODEM(ser)
@ -150,9 +149,15 @@ def send_file(file):
parser = optparse.OptionParser(usage='%prog [filename]')
parser.add_option("-d", "--debug",
action="store_true", dest="debug",
help="output debug logging to ymodem.log")
options, args = parser.parse_args()
if options.debug:
logging.basicConfig(filename='/tmp/codiUpdate.log', level=logging.DEBUG)
lock = "/tmp/.codi.lock"
killed = lock_file.check_and_kill(lock)
lock_file.lock(lock)

18
codi-app/xmodem/__init__.py
View file

@ -217,7 +217,7 @@ class YMODEM(object):
self.log.debug('cancellation at start sequence.')
cancel = 1
else:
self.log.error('send error: expected NAK, CRC, or CAN; '
self.log.info('send error: expected NAK, CRC, or CAN; '
'got %r', char)
error_count += 1
@ -279,7 +279,7 @@ class YMODEM(object):
self.ser.write(header + data + checksum)
else:
rubbish = self.ser.read(self.ser.in_waiting-1)
self.log.error('got NAK rubbish %r for block %d', rubbish, sequence)
self.log.info('got NAK rubbish %r for block %d', rubbish, sequence)
continue
if char == ACK or char == ACK2 or char == NAK:
success_count += 1
@ -288,19 +288,19 @@ class YMODEM(object):
error_count = 0
if char == NAK:
rubbish = self.ser.read(1024)
self.log.error('got NAK rubbish %r for block %d', rubbish, sequence)
self.log.info('got NAK rubbish %r for block %d', rubbish, sequence)
rubbish = self.ser.read(1024)
self.log.error('got NAK rubbish %r for block %d', rubbish, sequence)
self.log.info('got NAK rubbish %r for block %d', rubbish, sequence)
rubbish = self.ser.read(1024)
self.log.error('got NAK rubbish %r for block %d', rubbish, sequence)
self.log.info('got NAK rubbish %r for block %d', rubbish, sequence)
rubbish = self.ser.read(1024)
self.log.error('got NAK rubbish %r for block %d', rubbish, sequence)
self.log.info('got NAK rubbish %r for block %d', rubbish, sequence)
break
if char == ABT:
self.log.debug('got abort')
return False
self.log.error('send error: expected CRC|ACK; got %r for block %d',
self.log.info('send error: expected CRC|ACK; got %r for block %d',
char, sequence)
error_count += 1
if callable(callback):
@ -308,7 +308,7 @@ class YMODEM(object):
if error_count > retry:
# excessive amounts of retransmissions requested,
# abort transfer
self.log.error('send error: Unexpected received %d times, '
self.log.info('send error: Unexpected received %d times, '
'aborting.', error_count)
self.abort(timeout=timeout)
return False
@ -329,7 +329,7 @@ class YMODEM(object):
if char == ACK:
break
else:
self.log.error('send error: expected ACK; got %r', char)
self.log.info('send error: expected ACK; got %r', char)
error_count += 1
if error_count > retry:
self.log.warning('EOT was not ACKd, aborting transfer')