GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-13 01:30:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Devaev Maxim 2020-10-14 19:34:58 +03:00
parent 55968f9328
commit 9ba3fdb911
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kvmd/plugins/hid/serial.py
View File

@ -321,6 +321,9 @@ class Plugin(BaseHid, multiprocessing.Process): # pylint: disable=too-many-inst
self.__queue_event(_MouseWheelEvent(delta_x, delta_y)) self.__queue_event(_MouseWheelEvent(delta_x, delta_y))
def clear_events(self) -> None: def clear_events(self) -> None:
# FIXME: Если очистка производится со стороны процесса хида, то возможна гонка между
# очисткой и добавлением события _ClearEvent. Неприятно, но не смертельно.
# Починить блокировкой после перехода на асинхронные очереди.
tools.clear_queue(self.__events_queue) tools.clear_queue(self.__events_queue)
self.__queue_event(_ClearEvent()) self.__queue_event(_ClearEvent())
@ -347,19 +350,14 @@ class Plugin(BaseHid, multiprocessing.Process): # pylint: disable=too-many-inst
if not self.__process_command(tty, event.make_command()): if not self.__process_command(tty, event.make_command()):
self.clear_events() self.clear_events()
except serial.SerialException as err: except Exception as err:
self.clear_events() self.clear_events()
if err.errno == errno.ENOENT: if isinstance(err, serial.SerialException) and err.errno == errno.ENOENT: # pylint: disable=no-member
logger.error("Missing HID serial device: %s", self.__device_path) logger.error("Missing HID serial device: %s", self.__device_path)
else: else:
logger.exception("Unexpected HID error") logger.exception("Unexpected HID error")
time.sleep(1) time.sleep(1)
except Exception:
self.clear_events()
logger.exception("Unexpected HID error")
time.sleep(1)
def __get_serial(self) -> serial.Serial: def __get_serial(self) -> serial.Serial:
return serial.Serial(self.__device_path, self.__speed, timeout=self.__read_timeout) return serial.Serial(self.__device_path, self.__speed, timeout=self.__read_timeout)