From b0d10c0df30e428c5d61764e90529607fbe6cf6f Mon Sep 17 00:00:00 2001 From: Akhtarov Danil Date: Thu, 22 Feb 2018 18:16:32 +0500 Subject: [PATCH] Logging --- sportorg/gui/dialogs/bib_dialog.py | 2 +- sportorg/gui/dialogs/bib_report_dialog.py | 2 +- sportorg/gui/dialogs/course_edit.py | 4 +-- sportorg/gui/dialogs/cp_delete.py | 2 +- sportorg/gui/dialogs/entry_edit.py | 2 +- sportorg/gui/dialogs/entry_filter.py | 2 +- sportorg/gui/dialogs/event_properties.py | 2 +- sportorg/gui/dialogs/group_edit.py | 2 +- sportorg/gui/dialogs/group_ranking.py | 4 +-- sportorg/gui/dialogs/live_dialog.py | 2 +- sportorg/gui/dialogs/not_start_dialog.py | 2 +- sportorg/gui/dialogs/organization_edit.py | 2 +- sportorg/gui/dialogs/print_properties.py | 6 ++-- sportorg/gui/dialogs/relay_number_dialog.py | 2 +- sportorg/gui/dialogs/report_dialog.py | 2 +- sportorg/gui/dialogs/results_edit.py | 2 +- sportorg/gui/dialogs/scores_dialog.py | 2 +- sportorg/gui/dialogs/search_dialog.py | 2 +- sportorg/gui/dialogs/settings.py | 2 +- sportorg/gui/dialogs/start_chess_dialog.py | 2 +- sportorg/gui/dialogs/start_preparation.py | 2 +- sportorg/gui/dialogs/start_report_dialog.py | 2 +- .../gui/dialogs/start_time_change_dialog.py | 2 +- .../gui/dialogs/statistics_report_dialog.py | 2 +- sportorg/gui/dialogs/team_report_dialog.py | 2 +- .../gui/dialogs/team_results_report_dialog.py | 2 +- sportorg/gui/dialogs/teamwork_properties.py | 2 +- sportorg/gui/dialogs/text_io.py | 4 +-- .../gui/dialogs/timekeeping_properties.py | 2 +- sportorg/gui/main_window.py | 34 +++++++++++-------- sportorg/gui/menu/action.py | 2 +- sportorg/gui/menu/actions.py | 10 +++--- sportorg/gui/tabs/courses.py | 2 +- sportorg/gui/tabs/groups.py | 2 +- sportorg/gui/tabs/memory_model.py | 4 +-- sportorg/gui/tabs/race_results.py | 6 ++-- sportorg/gui/tabs/start_preparation.py | 4 +-- sportorg/gui/tabs/teams.py | 2 +- sportorg/language.py | 2 +- .../winorient/wdb_online_sender_dialog.py | 2 +- sportorg/models/constant.py | 6 ++-- sportorg/modules/live/orgeo.py | 10 +++--- .../modules/sportident/result_generation.py | 3 +- sportorg/modules/sportident/sireader.py | 18 +++++----- sportorg/modules/teamwork/client.py | 6 ++-- sportorg/modules/teamwork/server.py | 21 ++++++------ 46 files changed, 104 insertions(+), 98 deletions(-) diff --git a/sportorg/gui/dialogs/bib_dialog.py b/sportorg/gui/dialogs/bib_dialog.py index 24cde80d..96dc4d16 100644 --- a/sportorg/gui/dialogs/bib_dialog.py +++ b/sportorg/gui/dialogs/bib_dialog.py @@ -51,7 +51,7 @@ def apply_changes(): try: self.apply_changes_impl() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/dialogs/bib_report_dialog.py b/sportorg/gui/dialogs/bib_report_dialog.py index 8ccb0c9e..2bb6f64a 100644 --- a/sportorg/gui/dialogs/bib_report_dialog.py +++ b/sportorg/gui/dialogs/bib_report_dialog.py @@ -64,7 +64,7 @@ def apply_changes(): try: self.apply_changes_impl() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/dialogs/course_edit.py b/sportorg/gui/dialogs/course_edit.py index 2092b361..78ffac55 100644 --- a/sportorg/gui/dialogs/course_edit.py +++ b/sportorg/gui/dialogs/course_edit.py @@ -64,7 +64,7 @@ def apply_changes(): try: self.apply_changes_impl() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) @@ -131,7 +131,7 @@ def apply_changes_impl(self): try: control.length = int(i.split()[1]) except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) control.length = 0 course.controls.append(control) diff --git a/sportorg/gui/dialogs/cp_delete.py b/sportorg/gui/dialogs/cp_delete.py index 72a61790..1e23e874 100644 --- a/sportorg/gui/dialogs/cp_delete.py +++ b/sportorg/gui/dialogs/cp_delete.py @@ -52,7 +52,7 @@ def apply_changes(): try: self.apply_changes_impl() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/dialogs/entry_edit.py b/sportorg/gui/dialogs/entry_edit.py index a307585b..ed5ea366 100644 --- a/sportorg/gui/dialogs/entry_edit.py +++ b/sportorg/gui/dialogs/entry_edit.py @@ -124,7 +124,7 @@ def apply_changes(): try: self.apply_changes_impl() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/dialogs/entry_filter.py b/sportorg/gui/dialogs/entry_filter.py index 44c845a3..91ef1596 100644 --- a/sportorg/gui/dialogs/entry_filter.py +++ b/sportorg/gui/dialogs/entry_filter.py @@ -87,7 +87,7 @@ def accept(self): GlobalAccess().get_main_window().refresh() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.destroy() diff --git a/sportorg/gui/dialogs/event_properties.py b/sportorg/gui/dialogs/event_properties.py index e7ee67fb..6ba66d4e 100644 --- a/sportorg/gui/dialogs/event_properties.py +++ b/sportorg/gui/dialogs/event_properties.py @@ -86,7 +86,7 @@ def apply_changes(): try: self.apply_changes_impl() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/dialogs/group_edit.py b/sportorg/gui/dialogs/group_edit.py index 17bbb971..009192ab 100644 --- a/sportorg/gui/dialogs/group_edit.py +++ b/sportorg/gui/dialogs/group_edit.py @@ -104,7 +104,7 @@ def apply_changes(): try: self.apply_changes_impl() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/dialogs/group_ranking.py b/sportorg/gui/dialogs/group_ranking.py index 37030164..8e2b3d5d 100644 --- a/sportorg/gui/dialogs/group_ranking.py +++ b/sportorg/gui/dialogs/group_ranking.py @@ -35,7 +35,7 @@ def init_ui(self): try: self.layout.addRow(get_widget_from_ranking(cur_item)) except: - logging.exception() + logging.error() def cancel_changes(): self.close() @@ -44,7 +44,7 @@ def apply_changes(): try: self.apply_changes_impl() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/dialogs/live_dialog.py b/sportorg/gui/dialogs/live_dialog.py index 04b77a90..3a7a12bd 100644 --- a/sportorg/gui/dialogs/live_dialog.py +++ b/sportorg/gui/dialogs/live_dialog.py @@ -56,7 +56,7 @@ def apply_changes(): try: self.apply_changes_impl() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/dialogs/not_start_dialog.py b/sportorg/gui/dialogs/not_start_dialog.py index cc4cc5ba..99b5b0ef 100644 --- a/sportorg/gui/dialogs/not_start_dialog.py +++ b/sportorg/gui/dialogs/not_start_dialog.py @@ -39,7 +39,7 @@ def apply_changes(): try: self.apply_changes_impl() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/dialogs/organization_edit.py b/sportorg/gui/dialogs/organization_edit.py index efb36fab..74a211fc 100644 --- a/sportorg/gui/dialogs/organization_edit.py +++ b/sportorg/gui/dialogs/organization_edit.py @@ -66,7 +66,7 @@ def apply_changes(): try: self.apply_changes_impl() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/dialogs/print_properties.py b/sportorg/gui/dialogs/print_properties.py index c5e9299d..35eff450 100644 --- a/sportorg/gui/dialogs/print_properties.py +++ b/sportorg/gui/dialogs/print_properties.py @@ -84,7 +84,7 @@ def apply_changes(): try: self.apply_changes_impl() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) @@ -112,7 +112,7 @@ def set_values(self): # try: # QPrinter().setPrinterName(printer_name) # except Exception as e: - # logging.exception(str(e)) + # logging.error(str(e)) # printer_name = default_printer_name self.selected_split_printer.setText(printer_name) @@ -130,7 +130,7 @@ def select_printer(self): pd.exec() return printer.printerName() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) return None def apply_changes_impl(self): diff --git a/sportorg/gui/dialogs/relay_number_dialog.py b/sportorg/gui/dialogs/relay_number_dialog.py index a6ab2178..c7061b4c 100644 --- a/sportorg/gui/dialogs/relay_number_dialog.py +++ b/sportorg/gui/dialogs/relay_number_dialog.py @@ -42,7 +42,7 @@ def apply_changes(): try: self.apply_changes_impl() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/dialogs/report_dialog.py b/sportorg/gui/dialogs/report_dialog.py index 0c9494e2..f296b8d0 100644 --- a/sportorg/gui/dialogs/report_dialog.py +++ b/sportorg/gui/dialogs/report_dialog.py @@ -74,7 +74,7 @@ def apply_changes(): except FileNotFoundError as e: logging.error(str(e)) except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/dialogs/results_edit.py b/sportorg/gui/dialogs/results_edit.py index 0f9145c9..e0953e61 100644 --- a/sportorg/gui/dialogs/results_edit.py +++ b/sportorg/gui/dialogs/results_edit.py @@ -107,7 +107,7 @@ def apply_changes(): try: self.apply_changes_impl() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/dialogs/scores_dialog.py b/sportorg/gui/dialogs/scores_dialog.py index 5dd7b628..e0d99eef 100644 --- a/sportorg/gui/dialogs/scores_dialog.py +++ b/sportorg/gui/dialogs/scores_dialog.py @@ -52,7 +52,7 @@ def apply_changes(): try: self.apply_changes_impl() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/dialogs/search_dialog.py b/sportorg/gui/dialogs/search_dialog.py index 53efce44..2741258c 100644 --- a/sportorg/gui/dialogs/search_dialog.py +++ b/sportorg/gui/dialogs/search_dialog.py @@ -61,7 +61,7 @@ def accept(self): self.table.selectRow(offset) logging.info('Search: {}'.format(proxy_model.search)) except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) def reject(self): self.destroy() diff --git a/sportorg/gui/dialogs/settings.py b/sportorg/gui/dialogs/settings.py index ef73595f..fd95dd3b 100644 --- a/sportorg/gui/dialogs/settings.py +++ b/sportorg/gui/dialogs/settings.py @@ -56,7 +56,7 @@ def apply_changes(): try: self.apply_changes_impl() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/dialogs/start_chess_dialog.py b/sportorg/gui/dialogs/start_chess_dialog.py index 54682f89..2f314fde 100644 --- a/sportorg/gui/dialogs/start_chess_dialog.py +++ b/sportorg/gui/dialogs/start_chess_dialog.py @@ -55,7 +55,7 @@ def apply_changes(): try: self.apply_changes_impl() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/dialogs/start_preparation.py b/sportorg/gui/dialogs/start_preparation.py index fd396995..1b5c4221 100644 --- a/sportorg/gui/dialogs/start_preparation.py +++ b/sportorg/gui/dialogs/start_preparation.py @@ -272,7 +272,7 @@ def accept(self): GlobalAccess().get_main_window().refresh() self.save_state() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) def save_state(self): obj = race() diff --git a/sportorg/gui/dialogs/start_report_dialog.py b/sportorg/gui/dialogs/start_report_dialog.py index c3c253cd..befc71f9 100644 --- a/sportorg/gui/dialogs/start_report_dialog.py +++ b/sportorg/gui/dialogs/start_report_dialog.py @@ -74,7 +74,7 @@ def apply_changes(): except FileNotFoundError as e: logging.error(str(e)) except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/dialogs/start_time_change_dialog.py b/sportorg/gui/dialogs/start_time_change_dialog.py index a65458f4..187167f4 100644 --- a/sportorg/gui/dialogs/start_time_change_dialog.py +++ b/sportorg/gui/dialogs/start_time_change_dialog.py @@ -44,7 +44,7 @@ def apply_changes(): try: self.apply_changes_impl() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/dialogs/statistics_report_dialog.py b/sportorg/gui/dialogs/statistics_report_dialog.py index 2730ab1a..a06809e9 100644 --- a/sportorg/gui/dialogs/statistics_report_dialog.py +++ b/sportorg/gui/dialogs/statistics_report_dialog.py @@ -73,7 +73,7 @@ def apply_changes(): except FileNotFoundError as e: logging.error(str(e)) except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/dialogs/team_report_dialog.py b/sportorg/gui/dialogs/team_report_dialog.py index 09aa63bc..79193fa3 100644 --- a/sportorg/gui/dialogs/team_report_dialog.py +++ b/sportorg/gui/dialogs/team_report_dialog.py @@ -74,7 +74,7 @@ def apply_changes(): except FileNotFoundError as e: logging.error(str(e)) except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/dialogs/team_results_report_dialog.py b/sportorg/gui/dialogs/team_results_report_dialog.py index b97bb746..32f0adc5 100644 --- a/sportorg/gui/dialogs/team_results_report_dialog.py +++ b/sportorg/gui/dialogs/team_results_report_dialog.py @@ -73,7 +73,7 @@ def apply_changes(): except FileNotFoundError as e: logging.error(str(e)) except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/dialogs/teamwork_properties.py b/sportorg/gui/dialogs/teamwork_properties.py index ba84c5bf..a7fb24af 100644 --- a/sportorg/gui/dialogs/teamwork_properties.py +++ b/sportorg/gui/dialogs/teamwork_properties.py @@ -59,7 +59,7 @@ def apply_changes(): try: self.apply_changes_impl() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/dialogs/text_io.py b/sportorg/gui/dialogs/text_io.py index e5aba1b4..428f98cb 100644 --- a/sportorg/gui/dialogs/text_io.py +++ b/sportorg/gui/dialogs/text_io.py @@ -141,7 +141,7 @@ def get_text_wrapper(self): self.text_edit.setPlainText(get_text(index, key, separator)) except Exception as e: - logging.exception(e) + logging.error(e) def accept(self): try: @@ -181,7 +181,7 @@ def accept(self): logging.debug('text_io: empty value for line ' + i) logging.debug('text_io: processed ' + str(success_count) + ' from ' + str(len(lines)) + ' lines') except Exception as e: - logging.exception(e) + logging.error(e) self.close() diff --git a/sportorg/gui/dialogs/timekeeping_properties.py b/sportorg/gui/dialogs/timekeeping_properties.py index c9de2967..edf53e75 100644 --- a/sportorg/gui/dialogs/timekeeping_properties.py +++ b/sportorg/gui/dialogs/timekeeping_properties.py @@ -240,7 +240,7 @@ def apply_changes(): try: self.apply_changes_impl() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.close() button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel) diff --git a/sportorg/gui/main_window.py b/sportorg/gui/main_window.py index 26f8d3b8..0e127c8f 100644 --- a/sportorg/gui/main_window.py +++ b/sportorg/gui/main_window.py @@ -1,6 +1,7 @@ import ast import logging import time +from queue import Queue from threading import main_thread from PyQt5 import QtCore, QtGui, QtWidgets @@ -36,7 +37,7 @@ class ServiceListenerThread(QThread): def run(self): while True: - time.sleep(5) + time.sleep(1) self.interval.emit() if not main_thread().is_alive(): break @@ -66,6 +67,7 @@ def __init__(self, argv=None): except IndexError: self.file = None + self.log_queue = Queue() handler = ConsolePanelHandler(self) logging.root.addHandler(handler) @@ -226,9 +228,7 @@ def statusbar_message(self, msg, msecs=5000): self.statusbar.showMessage(msg, msecs) def logging(self, text): - self.statusbar_message(text) - if hasattr(self, 'logging_tab'): - self.logging_tab.write(text) + self.log_queue.put(text) def select_tab(self, index): self.current_tab = index @@ -264,7 +264,7 @@ def init_model(self): table.setModel(TeamMemoryModel()) event.event('init_model') except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) def refresh(self): logging.debug('Refreshing interface') @@ -290,7 +290,7 @@ def refresh(self): table.model().layoutChanged.emit() event.event('refresh') except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) def clear_filters(self, remove_condition=True): self.get_person_table().model().clear_filter(remove_condition) @@ -379,7 +379,7 @@ def add_sportident_result_from_sireader(self, result): except NoPrinterSelectedException as e: logging.error(str(e)) except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) Teamwork().send(result.to_dict()) self.auto_save() OrgeoClient().send_results() @@ -394,7 +394,7 @@ def add_sportident_result_from_sireader(self, result): break self.refresh() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) def teamwork(self, command): try: @@ -425,6 +425,12 @@ def interval(self): QtGui.QIcon(config.icon_dir(self.teamwork_icon[Teamwork().is_alive()]))) self.teamwork_status = Teamwork().is_alive() + while not self.log_queue.empty(): + text = self.log_queue.get() + self.statusbar_message(text) + if hasattr(self, 'logging_tab'): + self.logging_tab.write(text) + # Actions def create_file(self, *args, update_data=True): file_name = get_save_file_name( @@ -444,7 +450,7 @@ def create_file(self, *args, update_data=True): self.set_title(file_name) self.init_model() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) QMessageBox.warning(self, _('Error'), _('Cannot create file') + ': ' + file_name) self.refresh() @@ -460,7 +466,7 @@ def save_file(self): File(self.file, logging.root, File.JSON).save() self.apply_filters() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) else: self.save_file_as() @@ -473,7 +479,7 @@ def open_file(self, file_name=None): self.add_recent_file(self.file) self.init_model() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.delete_from_recent_files(file_name) QMessageBox.warning(self, _('Error'), _('Cannot read file, format unknown') + ': ' + file_name) @@ -491,7 +497,7 @@ def split_printout_selected(self): pass self.split_printout(obj.results[index]) except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) def split_printout(self, result): try: @@ -526,7 +532,7 @@ def add_object(self): self.get_organization_table().model().init_cache() self.refresh() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) def delete_object(self): try: @@ -534,7 +540,7 @@ def delete_object(self): return self._delete_object() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) def _delete_object(self): indexes = self.get_selected_rows() diff --git a/sportorg/gui/menu/action.py b/sportorg/gui/menu/action.py index df05b55c..fe12ec0f 100644 --- a/sportorg/gui/menu/action.py +++ b/sportorg/gui/menu/action.py @@ -14,7 +14,7 @@ def callback(self): try: self.execute() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) @abstractmethod def execute(self): diff --git a/sportorg/gui/menu/actions.py b/sportorg/gui/menu/actions.py index ca62e516..5376ab2d 100644 --- a/sportorg/gui/menu/actions.py +++ b/sportorg/gui/menu/actions.py @@ -92,7 +92,7 @@ def execute(self): try: winorient.import_csv(file_name) except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) QMessageBox.warning(self.app, _('Error'), _('Import error') + ': ' + file_name) self.app.init_model() @@ -104,7 +104,7 @@ def execute(self): try: winorient.import_wo_wdb(file_name) except WDBImportError as e: - logging.exception(str(e)) + logging.error(str(e)) QMessageBox.warning(self.app, _('Error'), _('Import error') + ': ' + file_name) self.app.init_model() @@ -116,7 +116,7 @@ def execute(self): try: ocad.import_txt_v8(file_name) except OcadImportException as e: - logging.exception(str(e)) + logging.error(str(e)) QMessageBox.warning(self.app, _('Error'), _('Import error') + ': ' + file_name) self.app.init_model() @@ -135,7 +135,7 @@ def execute(self): write_wdb(wdb_object, file_name) except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) QMessageBox.warning(self.app, _('Error'), _('Export error') + ': ' + file_name) @@ -147,7 +147,7 @@ def execute(self): try: iof_xml.export_result_list(file_name) except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) QMessageBox.warning(self.app, _('Error'), _('Export error') + ': ' + file_name) diff --git a/sportorg/gui/tabs/courses.py b/sportorg/gui/tabs/courses.py index abe79509..80875aa8 100644 --- a/sportorg/gui/tabs/courses.py +++ b/sportorg/gui/tabs/courses.py @@ -47,7 +47,7 @@ def course_double_clicked(index): dialog = CourseEditDialog(race().courses[index.row()]) dialog.exec() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.CourseTable.activated.connect(course_double_clicked) self.course_layout.addWidget(self.CourseTable) diff --git a/sportorg/gui/tabs/groups.py b/sportorg/gui/tabs/groups.py index 9f6d10a0..d8a8f3a4 100644 --- a/sportorg/gui/tabs/groups.py +++ b/sportorg/gui/tabs/groups.py @@ -45,7 +45,7 @@ def group_double_clicked(index): dialog = GroupEditDialog(race().groups[index.row()]) dialog.exec() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.GroupTable.activated.connect(group_double_clicked) self.group_layout.addWidget(self.GroupTable) diff --git a/sportorg/gui/tabs/memory_model.py b/sportorg/gui/tabs/memory_model.py index 3849a9af..7b95f1aa 100644 --- a/sportorg/gui/tabs/memory_model.py +++ b/sportorg/gui/tabs/memory_model.py @@ -76,7 +76,7 @@ def data(self, index, role=None): column = index.column() answer = self.cache[row][column] except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) # end = time.time() # logging.debug('Data() ' + str(index.row()) + ' ' + str(index.column()) + ': ' + str(end - start) + ' s') @@ -163,7 +163,7 @@ def sort(self, p_int, order=None): self.init_cache() self.layoutChanged.emit() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) def update_one_object(self, part, index): self.values[index] = self.get_values_from_object(part) diff --git a/sportorg/gui/tabs/race_results.py b/sportorg/gui/tabs/race_results.py index 9c9c871a..2ba93caf 100644 --- a/sportorg/gui/tabs/race_results.py +++ b/sportorg/gui/tabs/race_results.py @@ -41,7 +41,7 @@ def keyPressEvent(self, event): if event.key() == QtCore.Qt.Key_Up or event.key() == QtCore.Qt.Key_Down: self.entry_single_clicked(self.currentIndex()) except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) def entry_single_clicked(self, index): try: @@ -49,7 +49,7 @@ def entry_single_clicked(self, index): if -1 < index.row() < len(race().results): self.parent_widget.show_splits(index) except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) def double_clicked(self, index): try: @@ -58,7 +58,7 @@ def double_clicked(self, index): dialog = ResultEditDialog(race().results[index.row()]) dialog.exec() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) class Widget(QtWidgets.QWidget): diff --git a/sportorg/gui/tabs/start_preparation.py b/sportorg/gui/tabs/start_preparation.py index dd1e8b94..5b5ff4b6 100644 --- a/sportorg/gui/tabs/start_preparation.py +++ b/sportorg/gui/tabs/start_preparation.py @@ -64,7 +64,7 @@ def entry_double_clicked(index): dialog = EntryEditDialog(race().persons[index.row()]) dialog.exec() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) def entry_single_clicked(index): try: @@ -74,7 +74,7 @@ def entry_single_clicked(index): set_next_relay_number_to_person(obj.persons[index.row()]) except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.EntryTable.activated.connect(entry_double_clicked) self.EntryTable.clicked.connect(entry_single_clicked) diff --git a/sportorg/gui/tabs/teams.py b/sportorg/gui/tabs/teams.py index 3bf2a6e2..305beea4 100644 --- a/sportorg/gui/tabs/teams.py +++ b/sportorg/gui/tabs/teams.py @@ -46,7 +46,7 @@ def team_double_clicked(index): dialog = OrganizationEditDialog(race().organizations[index.row()]) dialog.exec() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.TeamTable.activated.connect(team_double_clicked) self.team_layout.addWidget(self.TeamTable) diff --git a/sportorg/language.py b/sportorg/language.py index 95902cb1..afa7105f 100644 --- a/sportorg/language.py +++ b/sportorg/language.py @@ -24,7 +24,7 @@ def _generate(): po = polib.pofile(path + '.po') po.save_as_mofile(path + '.mo') except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) _generate() diff --git a/sportorg/libs/winorient/wdb_online_sender_dialog.py b/sportorg/libs/winorient/wdb_online_sender_dialog.py index 694ab49e..05432661 100644 --- a/sportorg/libs/winorient/wdb_online_sender_dialog.py +++ b/sportorg/libs/winorient/wdb_online_sender_dialog.py @@ -38,7 +38,7 @@ def start(): try: self.start() except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) self.button_ok = QPushButton('Start') self.button_ok.clicked.connect(start) diff --git a/sportorg/models/constant.py b/sportorg/models/constant.py index 872893ca..a1a59daf 100644 --- a/sportorg/models/constant.py +++ b/sportorg/models/constant.py @@ -198,7 +198,7 @@ def get_race_groups(): ret.append(i.name) return ret except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) return get_groups() @@ -215,7 +215,7 @@ def get_race_teams(): ret.append(i.name) return ret except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) return get_teams() @@ -227,7 +227,7 @@ def get_race_courses(): ret.append(i.name) return ret except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) return [] diff --git a/sportorg/modules/live/orgeo.py b/sportorg/modules/live/orgeo.py index 8c57cdd6..ed73ac0b 100644 --- a/sportorg/modules/live/orgeo.py +++ b/sportorg/modules/live/orgeo.py @@ -65,18 +65,18 @@ def run(self): try: orgeo = Orgeo(command.url, self._user_agent, self._logger) response = orgeo.send(command.data) - self._logger.debug('status {}'.format(response.status_code)) - self._logger.debug(response.text) + self._logger.info('status {}'.format(response.status_code)) + self._logger.info(response.text) except ConnectionError as e: - self._logger.debug(str(e)) + self._logger.error(str(e)) time.sleep(10) except MissingSchema as e: - self._logger.debug(str(e)) + self._logger.error(str(e)) # if not self._queue.qsize(): # break except Exception as e: - self._logger.debug(str(e)) + self._logger.error(str(e)) class OrgeoClient(metaclass=Singleton): diff --git a/sportorg/modules/sportident/result_generation.py b/sportorg/modules/sportident/result_generation.py index 57bf8796..77568bf7 100644 --- a/sportorg/modules/sportident/result_generation.py +++ b/sportorg/modules/sportident/result_generation.py @@ -49,7 +49,7 @@ def _bib_dialog(self): if not self._person: self.assign_chip_reading = 'off' except Exception as e: - logging.exception(str(e)) + logging.error(str(e)) def add_result(self): if self._has_result(): @@ -78,7 +78,6 @@ def _add_result(self): self._add_result_to_race() logging.info('Sportident {}'.format(self._result)) - logging.debug(self._result.status) else: if self._find_person_by_result(): self._result.person = self._person diff --git a/sportorg/modules/sportident/sireader.py b/sportorg/modules/sportident/sireader.py index 4999e364..d2b71818 100644 --- a/sportorg/modules/sportident/sireader.py +++ b/sportorg/modules/sportident/sireader.py @@ -37,7 +37,7 @@ def run(self): try: si = sireader.SIReaderReadout(port=self.port, logger=logging.root) except Exception as e: - self._logger.denug(str(e)) + self._logger.error(str(e)) return while True: try: @@ -52,14 +52,14 @@ def run(self): self._queue.put(SIReaderCommand('card_data', card_data), timeout=1) si.ack_sicard() except sireader.SIReaderException as e: - self._logger.debug(str(e)) + self._logger.error(str(e)) except sireader.SIReaderCardChanged as e: - self._logger.debug(str(e)) + self._logger.error(str(e)) except serial.serialutil.SerialException as e: - self._logger.debug(str(e)) + self._logger.error(str(e)) return except Exception as e: - self._logger.debug(str(e)) + self._logger.error(str(e)) class ResultThread(QThread): @@ -87,7 +87,7 @@ def run(self): if not main_thread().is_alive() or self._stop_event.is_set(): break except Exception as e: - self._logger.exception(str(e)) + self._logger.error(str(e)) self._logger.debug('Stop adder result') def _check_data(self, card_data): @@ -222,12 +222,12 @@ def get_ports(): def choose_port(self): ports = self.get_ports() if len(ports): - self._logger.debug('Available Ports') + self._logger.info('Available Ports') for i, p in enumerate(ports): - self._logger.debug("{} - {}".format(i, p)) + self._logger.info("{} - {}".format(i, p)) return ports[0] else: - self._logger.debug('No ports available') + self._logger.info('No ports available') return None @staticmethod diff --git a/sportorg/modules/teamwork/client.py b/sportorg/modules/teamwork/client.py index bf8bf08a..daca84e9 100644 --- a/sportorg/modules/teamwork/client.py +++ b/sportorg/modules/teamwork/client.py @@ -93,7 +93,7 @@ def run(self): with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s: try: s.connect(self.addr) - self._logger.debug('Client start') + self._logger.info('Client start') sender = ClientSenderThread(s, self._in_queue, self._stop_event, self._logger) sender.start() receiver = ClientReceiverThread(s, self._out_queue, self._stop_event, self._logger) @@ -103,11 +103,11 @@ def run(self): receiver.join() except ConnectionRefusedError as e: - self._logger.debug(str(e)) + self._logger.error(str(e)) return except Exception as e: self._logger.debug(str(e)) return s.close() - self._logger.debug('Client shutdown') + self._logger.info('Client shutdown') diff --git a/sportorg/modules/teamwork/server.py b/sportorg/modules/teamwork/server.py index 5fda798d..53193a01 100644 --- a/sportorg/modules/teamwork/server.py +++ b/sportorg/modules/teamwork/server.py @@ -41,7 +41,7 @@ def __init__(self, conn, in_queue, out_queue, stop_event, logger=None): def run(self): with self.connect.conn: self._logger.debug('Server receiver start') - self._logger.debug('Connected by {}'.format(self.connect.addr)) + self._logger.info('Connected by {}'.format(self.connect.addr)) full_data = b'' self.connect.conn.settimeout(5) while True: @@ -64,13 +64,14 @@ def run(self): if not main_thread().is_alive() or self._stop_event.is_set(): break except ConnectionResetError as e: - self._logger.debug(str(e)) + self._logger.error(str(e)) break except Exception as e: - self._logger.debug(str(e)) + self._logger.error(str(e)) break self.connect.conn.close() - self._logger.debug('Server receiver shutdown') + self.connect.died() + self._logger.info('Disconnect {}'.format(self.connect.addr)) class ServerSenderThread(Thread): @@ -94,10 +95,10 @@ def run(self): data = json.dumps(command.data) connect.conn.sendall(b'0' + data.encode() + b'1') except ConnectionResetError as e: - self._logger.debug(str(e)) + self._logger.error(str(e)) connect.died() except OSError as e: - self._logger.debug(str(e)) + self._logger.error(str(e)) connect.died() except Empty: while not self._connections_queue.empty(): @@ -105,7 +106,7 @@ def run(self): if not main_thread().is_alive() or self._stop_event.is_set(): break except Exception as e: - self._logger.debug(str(e)) + self._logger.error(str(e)) self._logger.debug('Server sender shutdown') self._stop_event.set() @@ -132,7 +133,7 @@ def run(self): s.listen(1) s.settimeout(5) - self._logger.debug('Server start') + self._logger.info('Server start') conns_queue = Queue() sender = ServerSenderThread(self._in_queue, conns_queue, self._stop_event, self._logger) @@ -152,11 +153,11 @@ def run(self): if not main_thread().is_alive() or self._stop_event.is_set(): break except Exception as e: - self._logger.debug(str(e)) + self._logger.error(str(e)) sender.join() for srt in connections: srt.join() - self._logger.debug('Server shutdown') + self._logger.info('Server shutdown') if __name__ == '__main__':