Merge "Ensure that log message with non-ascii code does not raise exception"

This commit is contained in:
Zuul 2019-05-15 01:30:14 +00:00 committed by Gerrit Code Review
commit 97a6c8f8f1

View File

@ -85,9 +85,7 @@ class FixedIntervalLoopingCall(LoopingCallBase):
except LoopingCallDone as e: except LoopingCallDone as e:
self.stop() self.stop()
done.send(e.retvalue) done.send(e.retvalue)
except Exception as e: except Exception:
LOG.error('in fixed duration looping call. Error: %s',
str(e))
done.send_exception(*sys.exc_info()) done.send_exception(*sys.exc_info())
return return
else: else: