Refactor code a bit

iamluc · iamluc · commit 810ddcee7913 · 2024-09-18T17:59:37.000+02:00
diff --git a/ext/signals.c b/ext/signals.c
@@ -169,23 +169,23 @@ void ddtrace_signals_first_rinit(void) {
         return;
     }
 
-    bool crashtracker_installed = false;
-    if (get_DD_INSTRUMENTATION_TELEMETRY_ENABLED() && get_DD_CRASHTRACKING_ENABLED()) {
-        crashtracker_installed = true;
-        ddtrace_init_crashtracker();
-    }
+    bool install_crashtracker = get_DD_INSTRUMENTATION_TELEMETRY_ENABLED() && get_DD_CRASHTRACKING_ENABLED();
 
-    bool install_handler = get_DD_TRACE_HEALTH_METRICS_ENABLED();
+    bool install_backtrace_handler = get_DD_TRACE_HEALTH_METRICS_ENABLED();
 #if DDTRACE_HAVE_BACKTRACE
-    install_handler |= get_DD_LOG_BACKTRACE();
+    install_backtrace_handler |= get_DD_LOG_BACKTRACE();
 #endif
 
+    if (install_crashtracker) {
+        ddtrace_init_crashtracker();
+    }
+
     /* Install a signal handler for SIGSEGV and run it on an alternate stack.
      * Using an alternate stack allows the handler to run even when the main
      * stack overflows.
      */
-    if (install_handler) {
-        if (crashtracker_installed) {
+    if (install_backtrace_handler) {
+        if (install_crashtracker) {
             LOG(WARN, "Settings 'datadog.log_backtrace' and 'datadog.crashtracking_enabled' are mutually exclusive. Cannot enable the backtrace.");
             return;
         }
diff --git a/tests/ext/crashtracker_segfault_disabled.phpt b/tests/ext/crashtracker_segfault_disabled.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Send crashtracker report when segmentation fault signal is raised and config enables it
+Don't send crashtracker report when segmentation fault signal is raised and config disables it
 --SKIPIF--
 <?php
 if (!extension_loaded('posix')) die('skip: posix extension required');
@@ -15,7 +15,7 @@ DD_AGENT_HOST=request-replayer
 DD_TRACE_AGENT_PORT=80
 DD_CRASHTRACKING_ENABLED=0
 --INI--
-datadog.trace.agent_test_session_token=tests/ext/crashtracker_segfault.phpt
+datadog.trace.agent_test_session_token=tests/ext/crashtracker_segfault_disabled.phpt
 --FILE--
 <?php
 
