conditional message

wlandau · Sep 21, 2023 · eb3989b · eb3989b
1 parent 32cc3c1
commit eb3989b
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 21 deletions.
diff --git a/R/crew_controller_local.R b/R/crew_controller_local.R
@@ -37,13 +37,15 @@ crew_controller_local <- function(
   garbage_collection = FALSE,
   launch_max = 5L
 ) {
-  crew_deprecate(
-    name = "seconds_exit",
-    date = "2023-09-21",
-    version = "0.5.0.9002",
-    alternative = "none (no longer necessary)",
-    condition = "message"
-  )
+  if (!is.null(seconds_exit)) {
+    crew_deprecate(
+      name = "seconds_exit",
+      date = "2023-09-21",
+      version = "0.5.0.9002",
+      alternative = "none (no longer necessary)",
+      condition = "message"
+    )
+  }
   client <- crew_client(
     name = name,
     workers = workers,

diff --git a/R/crew_launcher.R b/R/crew_launcher.R
@@ -83,13 +83,15 @@ crew_launcher <- function(
   launch_max = 5L,
   tls = crew::crew_tls()
 ) {
-  crew_deprecate(
-    name = "seconds_exit",
-    date = "2023-09-21",
-    version = "0.5.0.9002",
-    alternative = "none (no longer necessary)",
-    condition = "message"
-  )
+  if (!is.null(seconds_exit)) {
+    crew_deprecate(
+      name = "seconds_exit",
+      date = "2023-09-21",
+      version = "0.5.0.9002",
+      alternative = "none (no longer necessary)",
+      condition = "message"
+    )
+  }
   name <- as.character(name %|||% crew_random_name())
   crew_assert(
     inherits(tls, "crew_class_tls"),

diff --git a/R/crew_launcher_local.R b/R/crew_launcher_local.R
@@ -31,13 +31,15 @@ crew_launcher_local <- function(
   launch_max = 5L,
   tls = crew::crew_tls()
 ) {
-  crew_deprecate(
-    name = "seconds_exit",
-    date = "2023-09-21",
-    version = "0.5.0.9002",
-    alternative = "none (no longer necessary)",
-    condition = "message"
-  )
+  if (!is.null(seconds_exit)) {
+    crew_deprecate(
+      name = "seconds_exit",
+      date = "2023-09-21",
+      version = "0.5.0.9002",
+      alternative = "none (no longer necessary)",
+      condition = "message"
+    )
+  }
   name <- as.character(name %|||% crew_random_name())
   launcher <- crew_class_launcher_local$new(
     name = name,

diff --git a/tests/testthat/test-crew_controller_local.R b/tests/testthat/test-crew_controller_local.R
@@ -540,3 +540,14 @@ crew_test("map() does not need an empty controller", {
   expect_equal(x$schedule$summary()$pushed, 0L)
   expect_equal(x$schedule$summary()$collected, 1L)
 })
+
+crew_test("deprecate seconds_exit", {
+  expect_message(
+    x <- crew_controller_local(
+      workers = 1L,
+      seconds_idle = 360,
+      seconds_exit = 1
+    ),
+    class = "crew_deprecate"
+  )
+})
diff --git a/tests/testthat/test-crew_launcher.R b/tests/testthat/test-crew_launcher.R
@@ -352,3 +352,7 @@ crew_test("custom launcher", {
   expect_equal(out$launches, 1L)
   controller$terminate()
 })
+
+crew_test("deprecate seconds_exit", {
+  expect_message(crew_launcher(seconds_exit = 1), class = "crew_deprecate")
+})
diff --git a/tests/testthat/test-crew_launcher_local.R b/tests/testthat/test-crew_launcher_local.R
@@ -193,3 +193,10 @@ crew_test("crew_launcher_local() can run a task and end a worker", {
     seconds_timeout = 5
   )
 })
+
+crew_test("deprecate seconds_exit", {
+  expect_message(
+    crew_launcher_local(seconds_exit = 1),
+    class = "crew_deprecate"
+  )
+})