diff --git a/SAS/Feedback_Service/src/Feedback.cc b/SAS/Feedback_Service/src/Feedback.cc index 76ec99cca9e26a0d32d6e07c1b8eaedeb96ee0f6..50cbaae3c544888b7f5e41b200ee7488c5b29d58 100644 --- a/SAS/Feedback_Service/src/Feedback.cc +++ b/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) { diff --git a/SAS/Feedback_Service/src/FeedbackService.conf b/SAS/Feedback_Service/src/FeedbackService.conf index 64c745844ba358847dc43cc822834cf54423b1b2..d733ca4bbe2dfa61a32e62922614111dd46d4b5f 100644 --- a/SAS/Feedback_Service/src/FeedbackService.conf +++ b/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 +