From a7039c5ca0c772c6c7adc7d36e5b5e80eff3626b Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Mon, 28 Jul 2014 10:02:49 +1000
Subject: [PATCH] Don't abort server_init if one of the initialisation commands
 fails.

---
 site_ansto/instrument/server_config.tcl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/site_ansto/instrument/server_config.tcl b/site_ansto/instrument/server_config.tcl
index f0108db6..f01d4d6a 100644
--- a/site_ansto/instrument/server_config.tcl
+++ b/site_ansto/instrument/server_config.tcl
@@ -269,14 +269,14 @@ proc server_set_sobj_attributes {} {
 proc server_init {} {
   global AUTOSAVE_STATE
 
+    if [ catch { ::source::isc_initialize } msg ] { puts $msg }
+    if [ catch { ::counter::isc_initialize } msg ] { puts $msg }
+    if [ catch { ::histogram_memory::isc_initialize } msg ] { puts $msg }
+    if [ catch { ::scan::isc_initialize } msg ] { puts $msg }
+    if [ catch { ::anticollider::init } msg ] { puts $msg }
+    if [ catch { ::commands::isc_initialize } msg ] { puts $msg }
+    if [ catch { ::nexus::isc_initialize } msg ] { puts $msg }
   set catch_status [ catch {
-    ::source::isc_initialize
-    ::counter::isc_initialize
-    ::histogram_memory::isc_initialize
-    ::scan::isc_initialize
-    ::anticollider::init
-    ::commands::isc_initialize
-    ::nexus::isc_initialize
     ########
     # Parameters set above the restore command will be clobbered by
     # the values in the status.tcl file