From 859c735f0ae84ac7611be324d0d631a310d2921c Mon Sep 17 00:00:00 2001
From: Ruud Overeem <overeem@astron.nl>
Date: Thu, 10 Jan 2008 10:39:16 +0000
Subject: [PATCH] Bug 1143: Hostname must now be specified.
---
MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc | 9 +++++----
MAC/APL/MainCU/src/MACScheduler/MACScheduler.conf.in | 1 +
MAC/APL/MainCU/src/MACScheduler/Makefile.am | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
index 2062f5649a4..ab3a367bd1b 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 eaad4f8d418..69fca7ddad6 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 f04e13655e4..e2e5b780aae 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 \
--
GitLab