ROHD-1732: Use dedicated db config for FeedbackService. Backported r42792 from LOFAR-Release-4_0.

SAS/Feedback_Service/src/Feedback.cc

@@ -122,7 +122,7 @@ GCFEvent::TResult Feedback::connect2OTDB_state(GCFEvent& event, GCFPortInterface
 	case F_ENTRY: 
 	case F_TIMER: {
 		// Try to setup the connection with the database
-		string	confFile = globalParameterSet()->getString("OTDBconfFile", "SASGateway.conf");
+		string	confFile = globalParameterSet()->getString("OTDBconfFile", "FeedbackService.conf");
 		ConfigLocator	CL;
 		string	filename = CL.locate(confFile);
 		LOG_DEBUG_STR("Trying to read database information from file " << filename);
@@ -131,7 +131,7 @@ GCFEvent::TResult Feedback::connect2OTDB_state(GCFEvent& event, GCFPortInterface
 		string database;
         try
         {
-            database = otdbconf.getString("SASGateway.OTDBdatabase");
+            database = otdbconf.getString("FeedbackService.OTDBdatabase");
         }
         catch(LOFAR::APSException& ex)
         {
@@ -143,7 +143,7 @@ GCFEvent::TResult Feedback::connect2OTDB_state(GCFEvent& event, GCFPortInterface
 		string dbhost;
         try
         {
-            dbhost = otdbconf.getString("SASGateway.OTDBhostname");
+            dbhost = otdbconf.getString("FeedbackService.OTDBhostname");
         }
         catch(LOFAR::APSException& ex)
         {
@@ -155,7 +155,7 @@ GCFEvent::TResult Feedback::connect2OTDB_state(GCFEvent& event, GCFPortInterface
         string username;
         try
         {
-            username = otdbconf.getString("SASGateway.OTDBusername");
+            username = otdbconf.getString("FeedbackService.OTDBusername");
         }
         catch(LOFAR::APSException& ex)
         {
@@ -167,7 +167,7 @@ GCFEvent::TResult Feedback::connect2OTDB_state(GCFEvent& event, GCFPortInterface
         string password;
         try
         {
-            password = otdbconf.getString("SASGateway.OTDBpassword");
+            password = otdbconf.getString("FeedbackService.OTDBpassword");
         }
         catch(LOFAR::APSException& ex)
         {
@@ -179,7 +179,7 @@ GCFEvent::TResult Feedback::connect2OTDB_state(GCFEvent& event, GCFPortInterface
         string port;
         try
         {
-            port = otdbconf.getString("SASGateway.OTDBport");
+            port = otdbconf.getString("FeedbackService.OTDBport");
         }
         catch(LOFAR::APSException& ex)
         {

SAS/Feedback_Service/src/FeedbackService.conf

@@ -5,3 +5,6 @@
 #
 FeedbackQueuenames = [ "otdb.task.feedback.dataproducts" , "otdb.task.feedback.processing" ]
 
+FeedbackService.OTDBdatabase = LOFAR_4
+FeedbackService.OTDBhostname = sasdb
+