@@ -620,20 +620,17 @@ def _set_result(
620
620
621
621
622
622
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
624
624
) -> 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 )
631
626
# The text of following exception will be rendered in the GUI and the error message may
632
627
# contain some remotely-fetched data (including HTML) so we are escaping it to avoid
633
628
# executing arbitrary HTML code.
634
629
# The escape function does not escape some simple tags used for formatting.
635
630
# 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
+ )
637
634
_set_result (
638
635
site_activation_status ,
639
636
PHASE_DONE ,
@@ -760,7 +757,7 @@ def fetch_sync_state(
760
757
except Exception as e :
761
758
duration = time .time () - sync_start
762
759
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 )
764
761
return None
765
762
766
763
@@ -790,7 +787,7 @@ def calc_sync_delta(
790
787
except Exception as e :
791
788
duration = time .time () - sync_start
792
789
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 )
794
791
return None
795
792
796
793
@@ -837,7 +834,7 @@ def synchronize_files(
837
834
site_logger .debug ("Finished config sync" )
838
835
return site_activation_state
839
836
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 )
841
838
return None
842
839
finally :
843
840
duration = time .time () - sync_start
@@ -1006,7 +1003,7 @@ def activate_site_changes(
1006
1003
_set_done_result (configuration_warnings , site_activation_state )
1007
1004
return site_activation_state
1008
1005
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 )
1010
1007
return None
1011
1008
1012
1009
@@ -1944,10 +1941,9 @@ def _handle_distributed_sites_in_free(
1944
1941
site_id for site_id in site_snapshot_settings if site_id != omd_site ()
1945
1942
]
1946
1943
for start_site_id in distributed_sites_in_free :
1947
- exc = MKUserError (None , get_free_message ())
1948
1944
_handle_activation_changes_exception (
1949
1945
logger .getChild (f"site[{ start_site_id } ]" ),
1950
- exc ,
1946
+ get_free_message () ,
1951
1947
{"_site_id" : start_site_id , "_time_started" : time_started },
1952
1948
)
1953
1949
return any (distributed_sites_in_free )
@@ -2067,7 +2063,7 @@ def _prepare_for_activation_tasks(
2067
2063
)
2068
2064
except Exception as e :
2069
2065
_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
2071
2067
)
2072
2068
_finalize_activation (site_id , activation_id , source )
2073
2069
return central_file_infos_per_site , site_activation_states_per_site
@@ -2247,7 +2243,7 @@ def create_broker_certificates(
2247
2243
except Exception as e :
2248
2244
duration = time .time () - sync_start
2249
2245
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 )
2251
2247
return None
2252
2248
2253
2249
0 commit comments