Include log_level args explicitly in log_* wrappers

DESCRIPTION

@@ -11,7 +11,7 @@ Date: 2021-10-10
 URL: https://daroczig.github.io/logger/
 BugReports: https://github.com/daroczig/logger/issues
 Encoding: UTF-8
-RoxygenNote: 7.1.2
+RoxygenNote: 7.3.1
 License: AGPL-3
 Imports:
   utils

R/logger.R

@@ -223,19 +223,26 @@ log_namespaces <- function() {
 #' log_level(level, ..., namespace = NA_character_,
 #'   .logcall = sys.call(), .topcall = sys.call(-1), .topenv = parent.frame())
 #'
-#' log_trace(...)
+#' log_trace(..., namespace = NA_character_,
+#'   .logcall = sys.call(), .topcall = sys.call(-1), .topenv = parent.frame())
 #'
-#' log_debug(...)
+#' log_debug(..., namespace = NA_character_,
+#'   .logcall = sys.call(), .topcall = sys.call(-1), .topenv = parent.frame())
 #'
-#' log_info(...)
+#' log_info(..., namespace = NA_character_,
+#'   .logcall = sys.call(), .topcall = sys.call(-1), .topenv = parent.frame())
 #'
-#' log_success(...)
+#' log_success(..., namespace = NA_character_,
+#'   .logcall = sys.call(), .topcall = sys.call(-1), .topenv = parent.frame())
 #'
-#' log_warn(...)
+#' log_warn(..., namespace = NA_character_,
+#'   .logcall = sys.call(), .topcall = sys.call(-1), .topenv = parent.frame())
 #'
-#' log_error(...)
+#' log_error(..., namespace = NA_character_,
+#'   .logcall = sys.call(), .topcall = sys.call(-1), .topenv = parent.frame())
 #'
-#' log_fatal(...)
+#' log_fatal(..., namespace = NA_character_,
+#'   .logcall = sys.call(), .topcall = sys.call(-1), .topenv = parent.frame())
 #' @examples \dontrun{
 #' log_level(INFO, 'hi there')
 #' log_info('hi there')
@@ -312,32 +319,39 @@ validate_log_level <- function(level) {
 
 
 #' @export
-log_fatal <- function(...) {
-    log_level(FATAL, ..., .logcall = sys.call(), .topcall = sys.call(-1), .topenv = parent.frame())
+log_fatal <- function(..., namespace = NA_character_,
+                      .logcall = sys.call(), .topcall = sys.call(-1), .topenv = parent.frame()) {
+    log_level(FATAL, ..., namespace = namespace, .logcall = .logcall, .topcall = .topcall, .topenv = .topenv)
 }
 #' @export
-log_error <- function(...) {
-    log_level(ERROR, ..., .logcall = sys.call(), .topcall = sys.call(-1), .topenv = parent.frame())
+log_error <- function(..., namespace = NA_character_,
+                      .logcall = sys.call(), .topcall = sys.call(-1), .topenv = parent.frame()) {
+    log_level(ERROR, ..., namespace = namespace, .logcall = .logcall, .topcall = .topcall, .topenv = .topenv)
 }
 #' @export
-log_warn <- function(...) {
-    log_level(WARN, ..., .logcall = sys.call(), .topcall = sys.call(-1), .topenv = parent.frame())
+log_warn <- function(..., namespace = NA_character_,
+                      .logcall = sys.call(), .topcall = sys.call(-1), .topenv = parent.frame()) {
+    log_level(WARN, ..., namespace = namespace, .logcall = .logcall, .topcall = .topcall, .topenv = .topenv)
 }
 #' @export
-log_success <- function(...) {
-    log_level(SUCCESS, ..., .logcall = sys.call(), .topcall = sys.call(-1), .topenv = parent.frame())
+log_success <- function(..., namespace = NA_character_,
+                      .logcall = sys.call(), .topcall = sys.call(-1), .topenv = parent.frame()) {
+    log_level(SUCCESS, ..., namespace = namespace, .logcall = .logcall, .topcall = .topcall, .topenv = .topenv)
 }
 #' @export
-log_info <- function(...) {
-    log_level(INFO, ..., .logcall = sys.call(), .topcall = sys.call(-1), .topenv = parent.frame())
+log_info <- function(..., namespace = NA_character_,
+                      .logcall = sys.call(), .topcall = sys.call(-1), .topenv = parent.frame()) {
+    log_level(INFO, ..., namespace = namespace, .logcall = .logcall, .topcall = .topcall, .topenv = .topenv)
 }
 #' @export
-log_debug <- function(...) {
-    log_level(DEBUG, ..., .logcall = sys.call(), .topcall = sys.call(-1), .topenv = parent.frame())
+log_debug <- function(..., namespace = NA_character_,
+                      .logcall = sys.call(), .topcall = sys.call(-1), .topenv = parent.frame()) {
+    log_level(DEBUG, ..., namespace = namespace, .logcall = .logcall, .topcall = .topcall, .topenv = .topenv)
 }
 #' @export
-log_trace <- function(...) {
-    log_level(TRACE, ..., .logcall = sys.call(), .topcall = sys.call(-1), .topenv = parent.frame())
+log_trace <- function(..., namespace = NA_character_,
+                      .logcall = sys.call(), .topcall = sys.call(-1), .topenv = parent.frame()) {
+    log_level(TRACE, ..., namespace = namespace, .logcall = .logcall, .topcall = .topcall, .topenv = .topenv)
 }
 
 

tests/testthat/test-layout.R

@@ -51,6 +51,7 @@ test_that('must throw errors', {
 
 log_layout(layout_logging)
 test_that('logging layout', {
+    expect_output(log_level(INFO, 'foo', namespace = 'bar'), 'INFO:bar:foo')
     expect_output(log_info('foobar'), 'INFO')
     expect_output(log_info('foo', namespace = 'bar'), 'foo')
     expect_output(log_info('foo', namespace = 'bar'), 'bar')

tests/testthat/test-logger.R

@@ -145,6 +145,10 @@ test_that('config setter called from do.call', {
     unlink(t)
 })
 
+test_that('providing log_level() args to wrappers diretly is OK', {
+    expect_silent(log_info('{Sepal.Length}', .topenv = iris))
+})
+
 ## reset settings
 log_threshold(threshold)
 log_layout(layout)