Merge pull request #495 from jluhrs/feature/SEQNG-552

SEQNG-552 Fixed bug in setting EPICS IO timeout.
gemini-hlsw · Mar 15, 2018 · f27d53f · f27d53f
2 parents b591586 + 407f09f
commit f27d53f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...es/edu.gemini.seqexec.server/src/main/scala/edu/gemini/seqexec/server/SeqexecEngine.scala b/...es/edu.gemini.seqexec.server/src/main/scala/edu/gemini/seqexec/server/SeqexecEngine.scala
@@ -531,10 +531,10 @@ object SeqexecEngine {
     // the configuration file or from the environment
     val caInit   = caAddrList.map(a => Task.delay(CaService.setAddressList(a))).getOrElse {
       Task.delay(Option(System.getenv("EPICS_CA_ADDR_LIST"))).flatMap {
-        case Some(_) => Task.delay(CaService.setIOTimeout(java.time.Duration.ofMillis(ioTimeout.toMillis)))
+        case Some(_) => taskUnit
         case _       => Task.fail(new RuntimeException("Cannot initialize EPICS subsystem"))
       }
-    }
+    } *> Task.delay(CaService.setIOTimeout(java.time.Duration.ofMillis(ioTimeout.toMillis)))
     val tcsInit  = (tcsKeywords || !tcsSim).fold(initEpicsSystem(TcsEpics, tops), taskUnit)
     // More instruments to be added to the list here
     val instList = site match {