streamline daemons()

shikokuchuo · Nov 9, 2023 · dadc064 · dadc064
1 parent 1c7e5d4
commit dadc064
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,6 @@
 # mirai 0.11.1.9000 (development)
 
+* Fixes regression in 0.11.1 which prevented the correct random seed being set when using dispatcher.
 * Internal performance enhancements.
 
 # mirai 0.11.1

diff --git a/R/daemons.R b/R/daemons.R
@@ -293,12 +293,11 @@ daemons <- function(n, url = NULL, remote = NULL, dispatcher = TRUE, ...,
   missing(n) && missing(url) && return(status(.compute))
 
   envir <- ..[[.compute]]
-  if (is.null(envir))
-    envir <- new.env(hash = FALSE, parent = ..)
 
   if (is.character(url)) {
 
-    if (!length(envir)) {
+    if (is.null(envir)) {
+      envir <- new.env(hash = FALSE, parent = ..)
       purl <- parse_url(url)
       if (substr(purl[["scheme"]], 1L, 3L) %in% c("wss", "tls") && is.null(tls)) {
         tls <- write_cert(cn = purl[["hostname"]])
@@ -354,9 +353,10 @@ daemons <- function(n, url = NULL, remote = NULL, dispatcher = TRUE, ...,
       length(envir[["sockc"]]) && reap(envir[["sockc"]])
       ..[[.compute]] <- NULL -> envir
 
-    } else if (!length(envir)) {
+    } else if (is.null(envir)) {
 
       n > 0L || stop(.messages[["n_zero"]])
+      envir <- new.env(hash = FALSE, parent = ..)
       urld <- auto_tokenized_url()
       cv <- cv()
       create_stream(n = n, seed = seed, envir = envir)
@@ -383,8 +383,7 @@ daemons <- function(n, url = NULL, remote = NULL, dispatcher = TRUE, ...,
 
   }
 
-  n <- envir[["n"]]
-  if (is.null(n)) 0L else if (!n) urls else n
+  if (is.null(envir)) 0L else if (envir[["n"]]) envir[["n"]] else envir[["urls"]]
 
 }