Skip to content

Commit ffd7eca

Browse files
author
Stefan Fleck
committed
some (possibly rediculous) performance improvements
1 parent 096a84f commit ffd7eca

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

R/Logger.R

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -632,6 +632,7 @@ Logger <- R6::R6Class(
632632
}
633633
),
634634

635+
635636
# active bindings ---------------------------------------------------------
636637
active = list(
637638
name = function(){
@@ -676,15 +677,15 @@ Logger <- R6::R6Class(
676677
threshold = function() {
677678
res <- get(".threshold", envir = private)
678679
if (is.null(res)){
679-
get("parent", envir = self)[["threshold"]]
680+
get("threshold", envir = get("parent", envir = self))
680681
} else {
681682
res
682683
}
683684
},
684685

685686

686687
inherited_appenders = function(){
687-
if (self$propagate){
688+
if (get(".propagate", envir = private)){
688689
c(
689690
get("parent", envir = self)$appenders,
690691
get("parent", envir = self)$inherited_appenders
@@ -694,11 +695,15 @@ Logger <- R6::R6Class(
694695
}
695696
},
696697

697-
exception_handler = function() {private$.exception_handler},
698698

699+
exception_handler = function() {
700+
get(".exception_handler", envir = private)
701+
},
699702

700-
appenders = function() {private$.appenders}
701703

704+
appenders = function() {
705+
get(".appenders", envir = private)
706+
}
702707
),
703708

704709

R/get_logger.R

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ get_logger <- function(
5454

5555
assert(is.character(name))
5656
assert(is_scalar_bool(reset))
57-
assert(R6::is.R6Class(class), "`class` must be an R6ClassGenerator")
5857

5958
nm_cur <- unlist(strsplit(name, "/", fixed = TRUE))
6059
name <- paste(nm_cur, collapse = "/")
@@ -71,15 +70,12 @@ get_logger <- function(
7170
}
7271

7372
if (is.null(res)){
73+
assert(R6::is.R6Class(class), "`class` must be an R6ClassGenerator")
7474
assign(name, class$new(name), envir = loggers, inherits = FALSE)
7575
return(get_logger(name, class = class))
7676
}
7777

78-
if (class$classname %in% class(res)){
79-
return(res)
80-
} else {
81-
stop(sprintf("'%s' is a %s but not a %s", name, class_fmt(res), fmt_class(class$classname)))
82-
}
78+
res
8379
}
8480

8581

0 commit comments

Comments
 (0)