remove overdesigned init log level

getsentry · Dec 19, 2024 · 25076ba · 25076ba
1 parent b617e6f
commit 25076ba
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 30 deletions.
diff --git a/include/sentry.h b/include/sentry.h
@@ -1069,7 +1069,8 @@ SENTRY_API const char *sentry_options_get_user_agent(
     const sentry_options_t *opts);
 
 /**
- * Enables or disables debug printing mode.
+ * Enables or disables debug printing mode. To change the log level from the
+ * default DEBUG level, use `sentry_options_set_logger_level`.
  */
 SENTRY_API void sentry_options_set_debug(sentry_options_t *opts, int debug);
 
@@ -1079,17 +1080,11 @@ SENTRY_API void sentry_options_set_debug(sentry_options_t *opts, int debug);
 SENTRY_API int sentry_options_get_debug(const sentry_options_t *opts);
 
 /**
- * Sets the level of the logger
+ * Sets the level of the logger. Has no effect if `debug` is not set to true.
  */
 SENTRY_API void sentry_options_set_logger_level(
     sentry_options_t *opts, sentry_level_t level);
 
-/**
- * Sets the log level for the sentry_init function
- */
-SENTRY_API void sentry_options_set_init_log_level(
-    sentry_options_t *opts, sentry_level_t level);
-
 /**
  * Sets the number of breadcrumbs being tracked and attached to events.
  *

diff --git a/src/sentry_core.c b/src/sentry_core.c
@@ -100,11 +100,6 @@ sentry_init(sentry_options_t *options)
     if (options->debug) {
         logger = options->logger;
     }
-    sentry_logger_t old_logger = logger; // restore this after init
-    if (options->log_init) {
-        logger = options->logger;
-        logger.logger_level = options->init_logger_level;
-    }
     sentry__logger_set_global(logger);
 
     // we need to ensure the dir exists, otherwise `path_absolute` will fail.
@@ -205,8 +200,6 @@ sentry_init(sentry_options_t *options)
     sentry__init_cached_functions();
 #endif
 
-    sentry__logger_set_global(old_logger);
-
     sentry__mutex_unlock(&g_options_lock);
     return 0;
 

diff --git a/src/sentry_options.c b/src/sentry_options.c
@@ -367,11 +367,7 @@ sentry_options_get_user_agent(const sentry_options_t *opts)
 void
 sentry_options_set_debug(sentry_options_t *opts, int debug)
 {
-    if (!!debug) {
-        sentry_options_set_logger_level(opts, SENTRY_LEVEL_DEBUG);
-    } else {
-        opts->debug = false;
-    }
+    opts->debug = !!debug;
 }
 
 int
@@ -405,14 +401,6 @@ void
 sentry_options_set_logger_level(sentry_options_t *opts, sentry_level_t level)
 {
     opts->logger.logger_level = level;
-    opts->debug = true;
-}
-
-void
-sentry_options_set_init_log_level(sentry_options_t *opts, sentry_level_t level)
-{
-    opts->init_logger_level = level;
-    opts->log_init = true;
 }
 
 void

diff --git a/src/sentry_options.h b/src/sentry_options.h
@@ -43,8 +43,6 @@ typedef struct sentry_options_s {
     sentry_path_t *database_path;
     sentry_path_t *handler_path;
     sentry_logger_t logger;
-    sentry_level_t init_logger_level;
-    bool log_init;
     size_t max_breadcrumbs;
     bool debug;
     bool auto_session_tracking;