Thinko + robustify by checking mirai::is_error_value() first and not …

…relying on type [#7]

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: future.mirai
-Version: 0.2.0-9003
+Version: 0.2.0-9004
 Depends:
     future
 Imports:

R/nbrOfWorkers.R

@@ -4,14 +4,15 @@
 nbrOfWorkers.mirai <- function(evaluator) {
   res <- status()
   workers <- res[["daemons"]]
+  if (is_error_value(workers)) {
+    reason <- capture.output(print(workers))
+    stop(FutureError(sprintf("mirai::status() failed to communicate with dispatcher: %s", reason)))
+  }
+
   if (is.character(workers)) {
     workers <- res[["connections"]]
     stopifnot(is.numeric(workers))
-  } else if (is_error_value(res)) {
-    reason <- capture.output(print(res))
-    stop(FutureError(sprintf("mirai::status() failed to communicate with dispatcher: %s", reason)))
-  } else if (is.numeric(workers)) { ## NOTE: Must come after is_error_value()
-  } else {
+  } else if (!is.numeric(workers)) {
     stop(FutureError(sprintf("Unknown type of mirai::daemons()$daemons: %s", typeof(workers))))
   }
 
@@ -37,14 +38,15 @@ nbrOfWorkers.mirai <- function(evaluator) {
 nbrOfFreeWorkers.mirai <- function(evaluator, background = FALSE, ...) {
   res <- status()
   workers <- res[["daemons"]]
+  if (is_error_value(workers)) {
+    reason <- capture.output(print(workers))
+    stop(FutureError(sprintf("mirai::status() failed to communicate with dispatcher: %s", reason)))
+  }
+
   if (is.character(workers)) {
      workers <- res[["connections"]]
      stopifnot(is.numeric(workers))
-  } else if (is_error_value(res)) {
-    reason <- capture.output(print(res))
-    stop(FutureError(sprintf("mirai::status() failed to communicate with dispatcher: %s", reason)))
-  } else if (is.numeric(workers)) { ## NOTE: Must come after is_error_value()
-  } else {
+  } else if (!is.numeric(workers)) {
     stop(FutureError(sprintf("Unknown type of mirai::daemons()$daemons: %s", typeof(workers))))
   }
 

R/utils,mirai.R

@@ -3,17 +3,17 @@
 get_mirai_daemons <- function() {
   status <- status()
   res <- status[["daemons"]]
+
+  if (is_error_value(res)) { # should not assume structure of an error value
+    reason <- capture.output(print(res))
+    stop(FutureError(sprintf("mirai::status() failed to communicate with dispatcher: %s", reason)))
+  }
 
   if (is.character(res)) {
     # returns number of daemons if running without dispatcher
     return(status[["connections"]])
   }
 
-  if (is_error_value(res)) { # should not assume structure of an error value
-    reason <- capture.output(print(res))
-    stop(FutureError(sprintf("mirai::status() failed to communicate with dispatcher: %s", reason)))
-  }
-
   as.data.frame(res)
 
 }