From 407f09fbb74d1ad5d9e77cb561e6cb8317b82125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20L=C3=BChrs?= Date: Thu, 15 Mar 2018 12:19:18 -0300 Subject: [PATCH] SEQNG-552 Fixed bug in setting EPICS IO timeout. --- .../main/scala/edu/gemini/seqexec/server/SeqexecEngine.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/edu.gemini.seqexec.server/src/main/scala/edu/gemini/seqexec/server/SeqexecEngine.scala b/modules/edu.gemini.seqexec.server/src/main/scala/edu/gemini/seqexec/server/SeqexecEngine.scala index 0ff4bb1e8b..debe7b968c 100644 --- a/modules/edu.gemini.seqexec.server/src/main/scala/edu/gemini/seqexec/server/SeqexecEngine.scala +++ b/modules/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 {