diff --git a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc index 2062f5649a47251599815195d60da771f45cdd2d..ab3a367bd1b3ae32af67c85177a5ecd0387018a2 100644 --- a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc +++ b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc @@ -209,13 +209,14 @@ GCFEvent::TResult MACScheduler::initial_state(GCFEvent& event, GCFPortInterface& string username = pParamSet->getString("OTDBusername"); string DBname = pParamSet->getString("OTDBdatabasename"); string password = pParamSet->getString("OTDBpassword"); + string hostname = pParamSet->getString("OTDBhostname"); - LOG_DEBUG ("Trying to connect to the OTDB"); - itsOTDBconnection= new OTDBconnection(username, password, DBname); + LOG_DEBUG_STR ("Trying to connect to the OTDB on " << hostname); + itsOTDBconnection= new OTDBconnection(username, password, DBname, hostname); ASSERTSTR (itsOTDBconnection, "Memory allocation error (OTDB)"); ASSERTSTR (itsOTDBconnection->connect(), - "Unable to connect to database " << DBname << " using " << - username << "," << password); + "Unable to connect to database " << DBname << " on " << hostname << + " using " << username << "," << password); LOG_INFO ("Connected to the OTDB"); itsPropertySet->setValue(PN_MS_OTDB_CONNECTED, GCFPVBool(true)); diff --git a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.conf.in b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.conf.in index eaad4f8d4186be9ddf915a1f888076cabd180fbf..69fca7ddad6fbcc868fb3fcfa2c6e0fdc9ab1791 100644 --- a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.conf.in +++ b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.conf.in @@ -2,6 +2,7 @@ prefix = LOFAR.PermSW.MACScheduler OTDBdatabasename = overeem +OTDBhostname = dop50.astron.nl OTDBusername = paulus OTDBpassword = boskabouter OTDBpollInterval = 5s diff --git a/MAC/APL/MainCU/src/MACScheduler/Makefile.am b/MAC/APL/MainCU/src/MACScheduler/Makefile.am index f04e13655e424af5e36dc73238a62ed985f745af..e2e5b780aaee6350f7af85895fb9f26105e417b1 100644 --- a/MAC/APL/MainCU/src/MACScheduler/Makefile.am +++ b/MAC/APL/MainCU/src/MACScheduler/Makefile.am @@ -1,4 +1,4 @@ -in_PROGRAMS = MACScheduler +bin_PROGRAMS = MACScheduler MACScheduler_CPPFLAGS = -DBOOST_DISABLE_THREADS \ -Wno-deprecated \