Task #3726: Merged into trunk

MAC/APL/CEPCU/src/CEPHardwareMonitor/CEPHardwareMonitorMain.cc

@@ -36,6 +36,7 @@ using namespace LOFAR::CEPCU;
 
 int main(int argc, char* argv[])
 {
+	try {
 		// args: cntlrname, parentHost, parentService
 		GCFScheduler::instance()->init(argc, argv, "CEPHardwareMonitor");
 
@@ -79,6 +80,10 @@ int main(int argc, char* argv[])
 		}
 		double	postRunTime = globalParameterSet()->getDouble("closingDelay", 1.5);
 		GCFScheduler::instance()->run(postRunTime);	// let processes die.
+	} catch( Exception &ex ) {
+		LOG_FATAL_STR("Caught exception: " << ex);
+		return 1;
+	}
 
 	return (0);
 }

MAC/APL/CEPCU/src/CEPlogProcessor/CEPlogProcessorMain.cc

@@ -49,15 +49,11 @@ int main (int argc, char* argv[])
 		loggerTask.start(); // make initial transition
 
 		GCFScheduler::instance()->run();
-
-		LOG_INFO_STR("Shutting down: " << argv[0]);
 	}
 	catch (LOFAR::Exception&	ex) {
 		LOG_FATAL_STR("Caught exception: " << ex);
-		LOG_FATAL     ("Terminated by exception!");
 		return (1);
 	}
 
-	LOG_INFO("Terminated normally");
 	return (0);
 }

MAC/APL/CEPCU/src/OnlineControl/OnlineControlMain.cc

@@ -42,6 +42,7 @@ int main(int argc, char* argv[])
 		return(-1);
 	}
 
+	try {
 		GCFScheduler::instance()->init(argc, argv, argv[1]);
 
 		ParentControl*	pc = ParentControl::instance();
@@ -51,6 +52,10 @@ int main(int argc, char* argv[])
 		olc.start(); 	// make initial transition
 
 		GCFScheduler::instance()->run();
+	} catch( Exception &ex ) {
+		LOG_FATAL_STR("Caught exception: " << ex);
+		return 1;
+	}
 
 	return (0);
 }

MAC/APL/CEPCU/src/PythonControl/PythonControlMain.cc

@@ -42,6 +42,7 @@ int main(int argc, char* argv[])
 		return(-1);
 	}
 
+	try {
 		GCFScheduler::instance()->init(argc, argv, "PythonControl");
 
 		ParentControl*	pc = ParentControl::instance();
@@ -51,6 +52,10 @@ int main(int argc, char* argv[])
 		pyc.start(); 	// make initial transition
 
 		GCFScheduler::instance()->run();
+	} catch( Exception &ex ) {
+		LOG_FATAL_STR("Caught exception: " << ex);
+		return 1;
+	}
 
 	return (0);
 }

MAC/APL/CEPCU/src/_OfflineControl/OfflineControlMain.cc

@@ -38,6 +38,8 @@ int main(int argc, char* argv[])
 	  printf("%s usage: %s <controller name>\n",argv[0],argv[0]);
 	  exit(-1);
 	}
+
+	try {
 		GCFTask::init(argc, argv);
 
 		ParentControl*	pc = ParentControl::instance();
@@ -47,6 +49,10 @@ int main(int argc, char* argv[])
 		ofc.start(); 	// make initial transition
 
 		GCFTask::run();
+	} catch( Exception &ex ) {
+		LOG_FATAL_STR("Caught exception: " << ex);
+		return 1;
+	}
 
 	return 0;
 }

MAC/APL/CUDaemons/src/CTStartDaemon/CTStartDaemonMain.cc

@@ -35,6 +35,7 @@ int main(int argc, char* argv[])
 {
 //	signal (SIGCHLD, SIG_IGN);
 
+	try {
 		GCFScheduler::instance()->init(argc, argv, "CTStartDaemon");
 
 		LOG_INFO("MACProcessScope: LOFAR_PermSW_Daemons_CTStartDaemon");
@@ -44,6 +45,10 @@ int main(int argc, char* argv[])
 		sd.start(); // make initial transition
 
 		GCFScheduler::instance()->run();
+	} catch( Exception &ex ) {
+		LOG_FATAL_STR("Caught exception: " << ex);
+		return 1;
+	}
 
 	return 0;
 }

MAC/APL/CUDaemons/src/ServiceBroker/ServiceBrokerMain.cc

@@ -36,6 +36,7 @@ Exception::TerminateHandler t(Exception::terminate);
 
 int main(int argc, char *argv[])
 {
+	try {
 		GCFScheduler::instance()->init(argc, argv, "ServiceBroker");
 		
 		LOG_INFO("MACProcessScope: LOFAR_PermSW_Daemons_ServiceBroker");
@@ -45,6 +46,10 @@ int main(int argc, char *argv[])
 		sb.start(); // make initial transition
 		
 		GCFScheduler::instance()->run();
+	} catch( Exception &ex ) {
+		LOG_FATAL_STR("Caught exception: " << ex);
+		return 1;
+	}
 
 	return 0;
 }

MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLoggerMain.cc

@@ -35,6 +35,7 @@ Exception::TerminateHandler t(Exception::terminate);
 
 int main(int argc, char *argv[])
 {
+	try {
 		GCFScheduler::instance()->init(argc, argv, "KeyValueLogger");
 		LOG_INFO("MACProcessScope: LOFAR_PermSW_Daemons_KVLogger");
 
@@ -42,6 +43,10 @@ int main(int argc, char *argv[])
 		kvl.start(); // make initial transition
 
 		GCFScheduler::instance()->run();
+	} catch( Exception &ex ) {
+		LOG_FATAL_STR("Caught exception: " << ex);
+		return 1;
+	}
 
 	return (0);
 }

MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessorMain.cc

@@ -35,6 +35,7 @@ Exception::TerminateHandler t(Exception::terminate);
 
 int main(int argc, char *argv[])
 {
+	try {
 		GCFScheduler::instance()->init(argc, argv, "LogProcessor");
 	//	LOG_INFO("MACProcessScope: LOFAR_PermSW_Daemons_LogProcessor");
 
@@ -42,6 +43,10 @@ int main(int argc, char *argv[])
 		clp.start(); // make initial transition
 
 		GCFScheduler::instance()->run();
+	} catch( Exception &ex ) {
+		LOG_FATAL_STR("Caught exception: " << ex);
+		return 1;
+	}
 
 	return (0);
 }

MAC/APL/CURTDBDaemons/src/SASGateway/SASGatewayMain.cc

@@ -35,6 +35,7 @@ Exception::TerminateHandler t(Exception::terminate);
 
 int main(int argc, char *argv[])
 {
+	try {
 		GCFScheduler::instance()->init(argc, argv, "SASGateway");
 		LOG_INFO("MACProcessScope: LOFAR_PermSW_Daemons_SASGateway");
 
@@ -42,6 +43,10 @@ int main(int argc, char *argv[])
 		SGW.start(); // make initial transition
 
 		GCFScheduler::instance()->run();
+	} catch( Exception &ex ) {
+		LOG_FATAL_STR("Caught exception: " << ex);
+		return 1;
+	}
 
 	return (0);
 }

MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitorMain.cc

@@ -40,6 +40,7 @@ Exception::TerminateHandler t(Exception::terminate);
 
 int main(int argc, char* argv[])
 {
+	try {
 		// args: cntlrname, parentHost, parentService
 		GCFScheduler::instance()->init(argc, argv, "SoftwareMonitor");
 
@@ -62,6 +63,10 @@ int main(int argc, char* argv[])
 
 		double	postRunTime = globalParameterSet()->getDouble("closingDelay", 1.5);
 		GCFScheduler::instance()->run(postRunTime);	// let processes die.
+	} catch( Exception &ex ) {
+		LOG_FATAL_STR("Caught exception: " << ex);
+		return 1;
+	}
 
 	return (0);
 }

MAC/APL/MainCU/src/CRTriggerControl/TriggerControlMain.cc

@@ -35,7 +35,7 @@ Exception::TerminateHandler t(Exception::terminate);
 
 int main(int argc, char* argv[])
 {
-	
+	try {
 		// args: cntlrname
 		GCFScheduler::instance()->init(argc, argv, argv[0]);
 
@@ -43,6 +43,10 @@ int main(int argc, char* argv[])
 		tc.start(); // make initial transition
 
 		GCFScheduler::instance()->run();
+	} catch( Exception &ex ) {
+		LOG_FATAL_STR("Caught exception: " << ex);
+		return 1;
+	}
 
 	return 0;
 }

MAC/APL/MainCU/src/MACScheduler/MACSchedulerMain.cc

@@ -36,6 +36,7 @@ Exception::TerminateHandler t(Exception::terminate);
 
 int main(int argc, char* argv[])
 {
+	try {
 		GCFScheduler::instance()->init(argc, argv, "MACScheduler");
 
 		ChildControl*	cc = ChildControl::instance();
@@ -45,6 +46,10 @@ int main(int argc, char* argv[])
 		ms.start(); // make initial transition
 	  
 		GCFScheduler::instance()->run();
+	} catch( Exception &ex ) {
+		LOG_FATAL_STR("Caught exception: " << ex);
+		return 1;
+	}
 
 	return 0;
 }

MAC/APL/MainCU/src/ObservationControl/ObservationControlMain.cc

@@ -36,6 +36,7 @@ Exception::TerminateHandler t(Exception::terminate);
 
 int main(int argc, char* argv[])
 {
+	try {
 		// args: cntlrname, parentHost, parentService
 		GCFScheduler::instance()->init(argc, argv, argv[1]);
 
@@ -49,6 +50,10 @@ int main(int argc, char* argv[])
 		oc.start(); // make initial transition
 
 		GCFScheduler::instance()->run();
+	} catch( Exception &ex ) {
+		LOG_FATAL_STR("Caught exception: " << ex);
+		return 1;
+	}
 
 	return 0;
 }

MAC/APL/StationCU/src/BeamControl/BeamControlMain.cc

@@ -34,6 +34,7 @@ Exception::TerminateHandler t(Exception::terminate);
 
 int main(int argc, char* argv[])
 {
+	try {
 		// args: cntlrname, parentHost, parentService
 		GCFScheduler::instance()->init(argc, argv, argv[1]);
 
@@ -44,6 +45,10 @@ int main(int argc, char* argv[])
 		bc.start(); 	// make initial transition
 
 		GCFScheduler::instance()->run();
+	} catch( Exception &ex ) {
+		LOG_FATAL_STR("Caught exception: " << ex);
+		return 1;
+	}
 
 	return 0;
 }

MAC/APL/StationCU/src/CalibrationControl/CalibrationControlMain.cc

@@ -34,6 +34,7 @@ Exception::TerminateHandler t(Exception::terminate);
 
 int main(int argc, char* argv[])
 {
+	try {
 		// args: cntlrname, parentHost, parentService
 		GCFScheduler::instance()->init(argc, argv, argv[1]);
 
@@ -44,6 +45,10 @@ int main(int argc, char* argv[])
 		cc.start(); 	// make initial transition
 
 		GCFScheduler::instance()->run();
+	} catch( Exception &ex ) {
+		LOG_FATAL_STR("Caught exception: " << ex);
+		return 1;
+	}
 
 	return 0;
 }

MAC/APL/StationCU/src/ClockControl/ClockControlMain.cc

@@ -39,6 +39,7 @@ int main(int argc, char* argv[])
 		return (1);
 	}
 
+	try {
 		// args: cntlrname, parentHost, parentService
 		GCFScheduler::instance()->init(argc, argv, "ClockControl");
 
@@ -49,6 +50,10 @@ int main(int argc, char* argv[])
 		cc.start(); 	// make initial transition
 
 		GCFScheduler::instance()->run();
+	} catch( Exception &ex ) {
+		LOG_FATAL_STR("Caught exception: " << ex);
+		return 1;
+	}
 
 	return 0;
 }

MAC/APL/StationCU/src/HardwareMonitor/HardwareMonitorMain.cc

@@ -42,6 +42,7 @@ Exception::TerminateHandler t(Exception::terminate);
 
 int main(int argc, char* argv[])
 {
+	try {
 		// args: cntlrname, parentHost, parentService
 		GCFScheduler::instance()->init(argc, argv, "HardwareMonitor");
 
@@ -101,6 +102,10 @@ int main(int argc, char* argv[])
 		}
 		double	postRunTime = globalParameterSet()->getDouble("closingDelay", 1.5);
 		GCFScheduler::instance()->run(postRunTime);	// let processes die.
+	} catch( Exception &ex ) {
+		LOG_FATAL_STR("Caught exception: " << ex);
+		return 1;
+	}
 
 	return (0);
 }

MAC/APL/StationCU/src/StationControl/StationControlMain.cc

@@ -37,6 +37,7 @@ int main(int argc, char* argv[])
 {
 	using LOFAR::basename;
 
+	try {
 		// args: cntlrname, parentHost, parentService
 		GCFScheduler::instance()->init(argc, argv, basename(argv[0]));
 
@@ -57,6 +58,10 @@ int main(int argc, char* argv[])
 		sc.start(); 	// make initial transition
 
 		GCFScheduler::instance()->run();
+	} catch( Exception &ex ) {
+		LOG_FATAL_STR("Caught exception: " << ex);
+		return 1;
+	}
 
 	return 0;
 }

MAC/APL/StationCU/src/TBBControl/TBBControlMain.cc

@@ -34,6 +34,7 @@ Exception::TerminateHandler t(Exception::terminate);
 
 int main(int argc, char* argv[])
 {
+	try {
 		// args: cntlrname, parentHost, parentService
 		GCFScheduler::instance()->init(argc, argv, argv[0]);
 		GCFScheduler::instance()->disableQueue();  // run as fast as possible
@@ -45,6 +46,10 @@ int main(int argc, char* argv[])
 		tc.start(); 	// make initial transition
 
 		GCFScheduler::instance()->run();
+	} catch( Exception &ex ) {
+		LOG_FATAL_STR("Caught exception: " << ex);
+		return 1;
+	}
 
 	return 0;
 }