Skip to content

Commit fe365c3

Browse files
committed
Revert "Don't create crash reports for user errors during activate changes"
This reverts commit 159f19b. Reason for revert: breaks UI end2end Change-Id: I8e399d3d2a2836134858d370037c0a71ecf6e2b1
1 parent 5a74544 commit fe365c3

File tree

1 file changed

+12
-16
lines changed

1 file changed

+12
-16
lines changed

Diff for: cmk/gui/watolib/activate_changes.py

+12-16
Original file line numberDiff line numberDiff line change
@@ -620,20 +620,17 @@ def _set_result(
620620

621621

622622
def _handle_activation_changes_exception(
623-
exc_logger: logging.Logger, exception: Exception, site_activation_status: SiteActivationState
623+
exc_logger: logging.Logger, exc_msg: str, site_activation_status: SiteActivationState
624624
) -> None:
625-
if isinstance(exception, (MKGeneralException, MKUserError)):
626-
exc_logger.exception("error activating changes")
627-
message = str(exception)
628-
else:
629-
crash = handle_exception_as_gui_crash_report(fail_silently=True)
630-
message = crash_dump_message(crash, user.may("general.see_crash_reports"))
625+
crash = handle_exception_as_gui_crash_report(fail_silently=True)
631626
# The text of following exception will be rendered in the GUI and the error message may
632627
# contain some remotely-fetched data (including HTML) so we are escaping it to avoid
633628
# executing arbitrary HTML code.
634629
# The escape function does not escape some simple tags used for formatting.
635630
# SUP-9840
636-
escaped_details = escaping.escape_text(message)
631+
escaped_details = escaping.escape_text(
632+
crash_dump_message(crash, user.may("general.see_crash_reports"))
633+
)
637634
_set_result(
638635
site_activation_status,
639636
PHASE_DONE,
@@ -760,7 +757,7 @@ def fetch_sync_state(
760757
except Exception as e:
761758
duration = time.time() - sync_start
762759
update_activation_time(site_id, ACTIVATION_TIME_SYNC, duration)
763-
_handle_activation_changes_exception(site_logger, e, site_activation_state)
760+
_handle_activation_changes_exception(site_logger, str(e), site_activation_state)
764761
return None
765762

766763

@@ -790,7 +787,7 @@ def calc_sync_delta(
790787
except Exception as e:
791788
duration = time.time() - sync_start
792789
update_activation_time(site_id, ACTIVATION_TIME_SYNC, duration)
793-
_handle_activation_changes_exception(site_logger, e, site_activation_state)
790+
_handle_activation_changes_exception(site_logger, str(e), site_activation_state)
794791
return None
795792

796793

@@ -837,7 +834,7 @@ def synchronize_files(
837834
site_logger.debug("Finished config sync")
838835
return site_activation_state
839836
except Exception as e:
840-
_handle_activation_changes_exception(site_logger, e, site_activation_state)
837+
_handle_activation_changes_exception(site_logger, str(e), site_activation_state)
841838
return None
842839
finally:
843840
duration = time.time() - sync_start
@@ -1006,7 +1003,7 @@ def activate_site_changes(
10061003
_set_done_result(configuration_warnings, site_activation_state)
10071004
return site_activation_state
10081005
except Exception as e:
1009-
_handle_activation_changes_exception(site_logger, e, site_activation_state)
1006+
_handle_activation_changes_exception(site_logger, str(e), site_activation_state)
10101007
return None
10111008

10121009

@@ -1944,10 +1941,9 @@ def _handle_distributed_sites_in_free(
19441941
site_id for site_id in site_snapshot_settings if site_id != omd_site()
19451942
]
19461943
for start_site_id in distributed_sites_in_free:
1947-
exc = MKUserError(None, get_free_message())
19481944
_handle_activation_changes_exception(
19491945
logger.getChild(f"site[{start_site_id}]"),
1950-
exc,
1946+
get_free_message(),
19511947
{"_site_id": start_site_id, "_time_started": time_started},
19521948
)
19531949
return any(distributed_sites_in_free)
@@ -2067,7 +2063,7 @@ def _prepare_for_activation_tasks(
20672063
)
20682064
except Exception as e:
20692065
_handle_activation_changes_exception(
2070-
logger.getChild(f"site[{site_id}]"), e, site_activation_state
2066+
logger.getChild(f"site[{site_id}]"), str(e), site_activation_state
20712067
)
20722068
_finalize_activation(site_id, activation_id, source)
20732069
return central_file_infos_per_site, site_activation_states_per_site
@@ -2247,7 +2243,7 @@ def create_broker_certificates(
22472243
except Exception as e:
22482244
duration = time.time() - sync_start
22492245
update_activation_time(site_id, ACTIVATION_TIME_SYNC, duration)
2250-
_handle_activation_changes_exception(site_logger, e, site_activation_state)
2246+
_handle_activation_changes_exception(site_logger, str(e), site_activation_state)
22512247
return None
22522248

22532249

0 commit comments

Comments
 (0)