diff --git a/DESCRIPTION b/DESCRIPTION index 42a4e260..fa704f35 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -16,7 +16,7 @@ Description: In computationally demanding analysis projects, 'clustermq' by Schubert (2019) ), and 'batchtools' by Lang, Bischel, and Surmann (2017) . -Version: 0.9.5.9009 +Version: 0.9.5.9010 License: MIT + file LICENSE URL: https://wlandau.github.io/crew/, https://github.com/wlandau/crew BugReports: https://github.com/wlandau/crew/issues diff --git a/NAMESPACE b/NAMESPACE index 2f1d4f46..fdc69e3a 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -107,6 +107,7 @@ importFrom(tools,SIGINT) importFrom(tools,SIGQUIT) importFrom(tools,SIGTERM) importFrom(tools,pskill) +importFrom(utils,capture.output) importFrom(utils,compareVersion) importFrom(utils,globalVariables) importFrom(utils,head) diff --git a/NEWS.md b/NEWS.md index 41e8e269..96a75b4c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# crew 0.9.5.9009 (development) +# crew 0.9.5.9010 (development) * Give full worker name in the worker launch error message (@multimeric). * Start the controller automatically in more methods. @@ -11,6 +11,9 @@ * To passively log memory usage when `log_resources` is given, the controller now calls `log()` as a side effect in most controller methods, with throttling to preserve speed. * Return a status and status code from `pop()` etc. * New internal function `as_monad()` makes error reporting more consistent. +* Use `path.expand()` on local log files. +* Switch to `Rscript`. +* Print session info from `crew_worker()` before attempting to dial into `mirai`. # crew 0.9.5 diff --git a/R/crew_launcher_local.R b/R/crew_launcher_local.R index a3bd5b64..f80cca5b 100644 --- a/R/crew_launcher_local.R +++ b/R/crew_launcher_local.R @@ -116,7 +116,7 @@ crew_class_launcher_local <- R6::R6Class( if (!private$.local_log_join) { name <- paste0(name, "-stdout") } - file.path(directory, paste0(name, ".log")) + path.expand(file.path(directory, paste0(name, ".log"))) }, .log_stderr = function(name) { directory <- private$.local_log_directory @@ -126,7 +126,7 @@ crew_class_launcher_local <- R6::R6Class( if_any( private$.local_log_join, "2>&1", - file.path(directory, paste0(name, "-stderr.log")) + path.expand(file.path(directory, paste0(name, "-stderr.log"))) ) } ), diff --git a/R/crew_package.R b/R/crew_package.R index e6d6910e..73c630dd 100644 --- a/R/crew_package.R +++ b/R/crew_package.R @@ -37,7 +37,7 @@ #' @importFrom tidyselect all_of any_of contains ends_with eval_select #' everything last_col matches num_range one_of starts_with #' @importFrom tools pskill SIGINT SIGQUIT SIGTERM -#' @importFrom utils compareVersion globalVariables head +#' @importFrom utils capture.output compareVersion globalVariables head NULL utils::globalVariables(".") diff --git a/R/crew_worker.R b/R/crew_worker.R index 71b7f0c0..94efa4e4 100644 --- a/R/crew_worker.R +++ b/R/crew_worker.R @@ -22,5 +22,6 @@ crew_worker <- function(settings, launcher, worker, instance) { CREW_WORKER = worker, CREW_INSTANCE = instance ) + crew_message(utils::capture.output(print(sessionInfo()))) do.call(what = mirai::daemon, args = settings) }