removed needlessly convoluted suspend mechanic

Author: s-fleck

R/Appender.R

@@ -135,7 +135,7 @@ Appender <- R6::R6Class(
 #'
 #' logger$add_appender(AppenderConsole$new())
 #' logger$add_appender(AppenderConsole$new(
-#'   layout = LayoutFormat$new("[%t] %c(): [%n] %m from user %u", colors = getOption("lgr.colors"))))
+#'   layout = LayoutFormat$new("[%t] %c(): [%n] %m", colors = getOption("lgr.colors"))))
 #'
 #' # Will output the message twice because we attached two console appenders
 #' logger$warn("A test message")
@@ -2144,6 +2144,10 @@ AppenderGmail <- R6::R6Class(
       )
       le    <- self$buffer_events[[length(self$buffer_events)]]
       title <- self$subject_layout$format_event(le)
+      title <- try(
+        iconv(title, from = "UTF-8", to = "ASCII//TRANSLIT"),
+        silent = TRUE
+      )
 
       mail <- gmailr::mime()
       mail <- gmailr::to(mail, self$to)

R/Logger.R

@@ -253,6 +253,8 @@ Logger <- R6::R6Class(
       timestamp = Sys.time(),
       caller = get_caller(-7)
     ){
+      if (identical(get(".threshold", envir = private), 0L)) return(NULL)
+
       tryCatch({
         # preconditions
         level <- standardize_log_levels(level)
@@ -338,6 +340,8 @@ Logger <- R6::R6Class(
 
 
     fatal = function(msg, ..., caller = get_caller(-8L)){
+      if (isTRUE(get(".threshold", envir = private) < 100L)) return(NULL)
+
       get("log", envir = self)(
         msg = msg,
         caller = caller,
@@ -348,6 +352,8 @@ Logger <- R6::R6Class(
     },
 
     error = function(msg, ..., caller = get_caller(-8L)){
+      if (isTRUE(get(".threshold", envir = private) < 200L)) return(NULL)
+
       get("log", envir = self)(
         msg = msg,
         caller = caller,
@@ -358,6 +364,8 @@ Logger <- R6::R6Class(
     },
 
     warn = function(msg, ..., caller = get_caller(-8L)){
+      if (isTRUE(get(".threshold", envir = private) < 300L)) return(NULL)
+
       get("log", envir = self)(
         msg = msg,
         caller = caller,
@@ -368,6 +376,8 @@ Logger <- R6::R6Class(
     },
 
     info = function(msg, ..., caller = get_caller(-8L)){
+      if (isTRUE(get(".threshold", envir = private) < 400L)) return(NULL)
+
       get("log", envir = self)(
         msg = msg,
         caller = caller,
@@ -378,6 +388,8 @@ Logger <- R6::R6Class(
     },
 
     debug = function(msg, ..., caller = get_caller(-8L)){
+      if (isTRUE(get(".threshold", envir = private) < 500L)) return(NULL)
+
       get("log", envir = self)(
         msg = msg,
         caller = caller,
@@ -388,6 +400,8 @@ Logger <- R6::R6Class(
     },
 
     trace = function(msg, ..., caller = get_caller(-8L)){
+      if (isTRUE(get(".threshold", envir = private) < 600L)) return(NULL)
+
       get("log", envir = self)(
         msg = msg,
         caller = caller,
@@ -469,10 +483,6 @@ Logger <- R6::R6Class(
 
     set_threshold = function(level){
       level <- standardize_threshold(level)
-
-      private$unsuspend()
-      private$suspend(level, inclusive = FALSE)
-
       private$.threshold <- as.integer(level)
       invisible(self)
     },
@@ -549,82 +559,14 @@ Logger <- R6::R6Class(
   # private -----------------------------------------------------------------
   private = list(
 
-    # +- methods --------------------------------------------------------------
-    suspend = function(
-      threshold = 0,
-      inclusive = TRUE
-    ){
-      assert(is_scalar_bool(inclusive))
-      threshold <- standardize_threshold(threshold)
-
-      if (is.na(threshold))
-        threshold <- Inf
-
-      if (inclusive){
-        ll <- private$.log_levels[private$.log_levels >= threshold]
-      } else {
-        ll <- private$.log_levels[private$.log_levels > threshold]
-      }
-
-      for (i in seq_along(ll)){
-        nm  <- names(ll)[[i]]
-        lvl <- ll[[i]]
-        private$suspended_loggers[[nm]] <- self[[nm]]
-        unlockBinding(nm, env = self)
-        self[[nm]] <- function(...) NULL
-        lockBinding(nm, env = self)
-      }
-      invisible(self)
-    },
-
-
-    unsuspend = function(
-      threshold = 0,
-      inclusive = TRUE
-    ){
-      assert(is_scalar_bool(inclusive))
-      threshold <- standardize_threshold(threshold)
-      if (is.na(threshold))
-        threshold <- Inf
-
-      if (inclusive){
-        ll <- private$.log_levels[private$.log_levels >= threshold]
-      } else {
-        ll <- private$.log_levels[private$.log_levels > threshold]
-      }
-
-      for (i in seq_along(private$suspended_loggers)){
-        nm  <- names(private$suspended_loggers)[[i]]
-        unlockBinding(nm, env = self)
-        self[[nm]] <- private$suspended_loggers[[nm]]
-        lockBinding(nm, env = self)
-      }
-      private$suspended_loggers <- list()
-      invisible(self)
-    },
-
-
     # +- fields ---------------------------------------------------------------
     .propagate = NULL,
     .exception_handler = NULL,
     .name = NULL,
     .parent = NULL,
     .appenders = NULL,
     .threshold = NA_integer_,
-    .last_event = NULL,
-
-    # intentionaly hardcoded and not using the global options. this is used to
-    # track which logging functions are available for the logger. used by
-    # suspend/unsuspend
-    .log_levels = as_log_levels(c(
-      "fatal" = 100L,
-      "error" = 200L,
-      "warn"  = 300L,
-      "info"  = 400L,
-      "debug" = 500L,
-      "trace" = 600L
-    )),
-    suspended_loggers = list()
+    .last_event = NULL
   )
 )
 
@@ -642,6 +584,8 @@ LoggerGlue <- R6::R6Class(
   public = list(
 
     fatal = function(..., caller = get_caller(-8L), .envir = parent.frame()){
+      if (isTRUE(get(".threshold", envir = private) < 100L)) return(NULL)
+
       force(.envir)
       get("log", envir = self)(
         ...,
@@ -653,6 +597,8 @@ LoggerGlue <- R6::R6Class(
     },
 
     error = function(..., caller = get_caller(-8L), .envir = parent.frame()){
+      if (isTRUE(get(".threshold", envir = private) < 200L)) return(NULL)
+
       get("log", envir = self)(
         ...,
         caller = caller,
@@ -663,6 +609,8 @@ LoggerGlue <- R6::R6Class(
     },
 
     warn = function(..., caller = get_caller(-8L), .envir = parent.frame()){
+      if (isTRUE(get(".threshold", envir = private) < 300L)) return(NULL)
+
       get("log", envir = self)(
         ...,
         caller = caller,
@@ -673,6 +621,8 @@ LoggerGlue <- R6::R6Class(
     },
 
     info = function(..., caller = get_caller(-8L), .envir = parent.frame()){
+      if (isTRUE(get(".threshold", envir = private) < 400L)) return(NULL)
+
       get("log", envir = self)(
         ...,
         caller = caller,
@@ -683,6 +633,8 @@ LoggerGlue <- R6::R6Class(
     },
 
     debug = function(..., caller = get_caller(-8L), .envir = parent.frame()){
+      if (isTRUE(get(".threshold", envir = private) < 500L)) return(NULL)
+
       force(.envir)
       get("log", envir = self)(
         ...,
@@ -694,6 +646,8 @@ LoggerGlue <- R6::R6Class(
     },
 
     trace = function(..., caller = get_caller(-8L), .envir = parent.frame()){
+      if (isTRUE(get(".threshold", envir = private) < 600L)) return(NULL)
+
       force(.envir)
       get("log", envir = self)(
         ...,
@@ -711,6 +665,8 @@ LoggerGlue <- R6::R6Class(
       caller = get_caller(-7),
       .envir = parent.frame()
     ){
+      if (identical(get(".threshold", envir = private), 0L)) return(NULL)
+
       force(.envir)
       tryCatch({
         # preconditions

R/log_levels.R

@@ -16,6 +16,9 @@ as_log_levels <- function(x){
 
 DEFAULT_LOG_LEVELS <- c("fatal", "error", "warn", "info", "debug", "trace")
 
+
+
+
 # manage options ----------------------------------------------------------
 
 #' Manage Log Levels
@@ -95,7 +98,9 @@ add_log_levels <- function(
 
 
 
+
 #' union for named vectors. names of `y` override names of `x`
+#' @noRd
 named_union <- function(x, y){
   assert(identical(length(names(x)), length(x)))
   assert(identical(length(names(y)), length(y)))
@@ -107,6 +112,8 @@ named_union <- function(x, y){
 }
 
 
+
+
 #' @param level_names a `character` vector of the names of the levels to remove
 #' @rdname get_log_levels
 #' @export
@@ -129,7 +136,6 @@ remove_log_levels <- function(
 
 
 
-
 # format ------------------------------------------------------------------
 
 fmt_log_levels <- function(
@@ -140,6 +146,7 @@ fmt_log_levels <- function(
 
 
 
+
 #' Colorize Levels
 #'
 #' @param x `numeric` or `character` levels to be colored. Unlike in many other
@@ -177,6 +184,7 @@ colorize_levels <- function(
 
 
 
+
 # standardize ------------------------------------------------------------
 
 #' Standardize User-Input Log Levels to Their Integer Representation

R/simple_logging.R

@@ -81,6 +81,7 @@ TRACE <- function(msg, ...){
 
 
 
+#' @inheritParams with_log_value
 #' @param logfun a `function` for processing the log request, usually
 #'   `lgr$info()`, `lgr$debug()`, etc... .
 #' @param caller a `character` scalar. The name of the calling function

man/AppenderConsole.Rd

@@ -1,5 +1,7 @@
 # AppenderPushbullet ----------------------------------------------------
 
+email <- whoami::email_address()
+
 test_that("AppenderPushbullet: ERROR log level triggers push", {
   skip_if_not_installed("RPushbullet")
 
@@ -25,7 +27,7 @@ test_that("AppenderPushbullet: ERROR log level triggers push", {
   l$debug("4")
   l$debug("something something 5ish has occurred")
 
-  l$fatal("Oh well, here we go", foo = "bar")
+  l$fatal("pushbullet wörks ÄÖÜßÄ", foo = "bar")
 })
 
 
@@ -36,7 +38,7 @@ test_that("AppenderSendmail: ERROR log level triggers push", {
 
   skip_if_not_installed("sendmailR")
   smtp  <- getOption("stat.smtp_server")
-  email <- whoami::email_address()
+
 
   if (is.null(smtp))  skip("Please set the 'stat.smtp_server' option")
   if (is.null(email)) skip("Cannot determine email addresse")
@@ -82,7 +84,7 @@ test_that("AppenderGmail: ERROR log level triggers push", {
   l$info("2")
   l$trace("3")
   l$debug("4")
-  l$debug("something something 5ish has occurred")
+  l$debug("ÄÖÜßÄ")
 
-  l$fatal("gmailr works", foo = "bar")
+  l$fatal("gmailr wörks ÄÖÜßÄ", foo = "bar")
 })

man/as.data.frame.LogEvent.Rd

@@ -98,10 +98,6 @@ test_that("setting appender threshold works", {
 test_that("suspending loggers works", {
   ml <- Logger$new("test_logger")
 
-  expect_output(ml$info("blubb"), "blubb")
-  ml$.__enclos_env__$private$suspend("info", inclusive = TRUE)
-  expect_silent(ml$info("blubb"))
-  ml$.__enclos_env__$private$unsuspend("info", inclusive = TRUE)
   expect_output(ml$info("blubb"), "blubb")
 
   expect_output(ml$fatal("blubb"), "FATAL")