More 'future.*' options are passed down to nested futures [#223]

futureverse · May 22, 2018 · 5daf270 · 5daf270
1 parent 2976ad2
commit 5daf270
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -3,7 +3,10 @@ Package: future
 
 Version: 1.8.1-9000 [2018-05-22]
 
- o ...
+NEW FEATURES:
+
+ o Now more 'future.*' options are passed down so that they are also
+   acknowledged when using nested futures.
 
 BUG FIX:
 

diff --git a/R/Future-class.R b/R/Future-class.R
@@ -613,8 +613,17 @@ makeExpression <- function(expr, local = TRUE, globals.onMissing = getOption("fu
     ...future.oldOptions <- options(
       ## Prevent .future.R from being source():d when future is attached
       future.startup.loadScript = FALSE,
+
       ## Assert globals when future is created (or at run time)?
-      future.globals.onMissing = .(globals.onMissing)
+      future.globals.onMissing = .(globals.onMissing),
+
+      ## Pass down other future.* options
+      future.globals.maxSize     = .(getOption("future.globals.maxSize")),
+      future.globals.method      = .(getOption("future.globals.method")),
+      future.globals.onMissing   = .(getOption("future.globals.onMissing")),
+      future.globals.onReference = .(getOption("future.globals.onReference")),
+      future.globals.resolve     = .(getOption("future.globals.resolve")),
+      future.resolve.recursive   = .(getOption("future.resolve.recursive"))
     )
     .(enter)
   })