Merge pull request #187 from shikokuchuo/mirai

Tidy-ups post mirai 1.3.0 release
wlandau · Oct 10, 2024 · 6f79d30 · 6f79d30
2 parents 80fa70e + 865ca6b
commit 6f79d30
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -45,8 +45,8 @@ Imports:
   data.table,
   getip,
   later,
-  mirai (>= 1.1.0),
-  nanonext (>= 1.1.0),
+  mirai (>= 1.3.0),
+  nanonext (>= 1.3.0),
   processx,
   promises,
   ps,

diff --git a/R/crew_async.R b/R/crew_async.R
@@ -82,9 +82,8 @@ crew_class_async <- R6::R6Class(
       private$.instance <- crew::crew_random_name()
       mirai::daemons(
         n = private$.workers,
-        dispatcher = FALSE,
+        dispatcher = "none",
         autoexit = crew_terminate_signal(),
-        resilience = FALSE,
         idletime = 60000,
         .compute = private$.instance
       )

diff --git a/R/crew_client.R b/R/crew_client.R
@@ -280,7 +280,7 @@ crew_class_client <- R6::R6Class(
       mirai::daemons(
         n = private$.workers,
         url = url,
-        dispatcher = TRUE,
+        dispatcher = "process",
         seed = NULL,
         tls = private$.tls$client(),
         pass = private$.tls$password,

diff --git a/tests/local/test-tls.R b/tests/local/test-tls.R
@@ -30,7 +30,7 @@ crew_test("mirai client can start using custom credentials", {
     tmp <- mirai::daemons(
       n = 1L,
       url = "wss://127.0.0.1:0",
-      dispatcher = TRUE,
+      dispatcher = "process",
       seed = NULL,
       tls = c(
         paste(readLines("fd.crt"), collapse = "\n"),

diff --git a/tests/testthat/test-crew_monitor_local.R b/tests/testthat/test-crew_monitor_local.R
@@ -3,7 +3,7 @@ crew_test("monitor dispatchers", {
   skip_on_os("windows")
   x <- crew_monitor_local()
   expect_true(is.integer(x$dispatchers()))
-  mirai::daemons(n = 1L, dispatcher = TRUE)
+  mirai::daemons(n = 1L, dispatcher = "process")
   on.exit({
     mirai::daemons(n = 0L)
     gc()

diff --git a/tests/testthat/test-crew_worker.R b/tests/testthat/test-crew_worker.R
@@ -8,7 +8,7 @@ crew_test("crew_worker() can run mirai tasks and assigns env vars", {
   mirai::daemons(
     n = 1L,
     url = "ws://127.0.0.1:0",
-    dispatcher = TRUE,
+    dispatcher = "process",
     token = TRUE
   )
   on.exit(mirai::daemons(n = 0L), add = TRUE)
@@ -70,7 +70,7 @@ crew_test("crew_worker() metrics logging to a directory", {
   mirai::daemons(
     n = 1L,
     url = "ws://127.0.0.1:0",
-    dispatcher = TRUE,
+    dispatcher = "process",
     token = TRUE
   )
   on.exit(mirai::daemons(n = 0L), add = TRUE)