From 0b8325da7ca73da2f553175f04ed86e08326d3f9 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Mon, 3 Jun 2013 23:53:42 +0200 Subject: [PATCH] bug #2099: Move XML-RPC initialization after MADS are loaded. It prevents load failures, by Simon Boulet --- src/nebula/Nebula.cc | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/nebula/Nebula.cc b/src/nebula/Nebula.cc index 9cd4e7bdf6..f8d35297a5 100644 --- a/src/nebula/Nebula.cc +++ b/src/nebula/Nebula.cc @@ -850,6 +850,24 @@ void Nebula::start() throw runtime_error("Could not start the Image Manager"); } + // ----------------------------------------------------------- + // Load mads + // ----------------------------------------------------------- + + sleep(2); + + vmm->load_mads(0); + + im->load_mads(0); + tm->load_mads(0); + hm->load_mads(0); + imagem->load_mads(0); + + if ( authm != 0 ) + { + authm->load_mads(0); + } + // ---- Request Manager ---- try { @@ -872,24 +890,6 @@ void Nebula::start() throw runtime_error("Could not start the Request Manager"); } - // ----------------------------------------------------------- - // Load mads - // ----------------------------------------------------------- - - sleep(2); - - vmm->load_mads(0); - - im->load_mads(0); - tm->load_mads(0); - hm->load_mads(0); - imagem->load_mads(0); - - if ( authm != 0 ) - { - authm->load_mads(0); - } - // ----------------------------------------------------------- // Wait for a SIGTERM or SIGINT signal // -----------------------------------------------------------