[Swift-commit] r4040 - SwiftApps/SwiftR/Swift/R

[noreply at svn.ci.uchicago.edu]

Author: tga
Date: 2011-01-27 08:47:43 -0600 (Thu, 27 Jan 2011)
New Revision: 4040

Modified:
   SwiftApps/SwiftR/Swift/R/Workers.R
Log:
Tweak to swiftInit to save swift.server setting if it has not already been set.


Modified: SwiftApps/SwiftR/Swift/R/Workers.R
===================================================================
--- SwiftApps/SwiftR/Swift/R/Workers.R	2011-01-26 22:09:49 UTC (rev 4039)
+++ SwiftApps/SwiftR/Swift/R/Workers.R	2011-01-27 14:47:43 UTC (rev 4040)
@@ -44,6 +44,8 @@
     
     if(is.null(server))
         server <- getOption("swift.server")
+        if(is.null(server))
+            server <- "local"
     if(! is.null(server) )  {
         cmdString <- paste(cmdString, "-s", shQuote(server)) 
     }
@@ -118,6 +120,11 @@
     # this process exits
     addHook()
 
+    # by default, set the swift.server option so that
+    # subsequent swift*apply calls use the newly created
+    # server
+    if (is.null(getOption("swift.server"))) 
+        options(swift.server=server)
     # Sleep to give start-swift time to set up fifos,etc
     Sys.sleep(2)
     return (output)