Messaging plugin enabled by default (with hardcoded default broker for now).

diff --git a/org.glite.lb.logger-msg/config/msg.conf.example b/org.glite.lb.logger-msg/config/msg.conf.example
index 19f2221..ca51a50 100644 (file)
--- a/org.glite.lb.logger-msg/config/msg.conf.example
+++ b/org.glite.lb.logger-msg/config/msg.conf.example
@@ -7,3 +7,5 @@ plugin = activemq_cpp_plugin.so
 
 [msg]
 broker = tcp://dev.msg.cern.ch:6166
+#broker = tcp://egi-1.msg.cern.ch:6166
+#broker = tcp://egi-2.msg.cern.ch:6166

diff --git a/org.glite.lb.yaim/config/defaults/glite-lb.pre b/org.glite.lb.yaim/config/defaults/glite-lb.pre
index 6c8e2cd..0141a88 100644 (file)
--- a/org.glite.lb.yaim/config/defaults/glite-lb.pre
+++ b/org.glite.lb.yaim/config/defaults/glite-lb.pre
@@ -41,7 +41,7 @@ GLITE_LB_RTM_ENABLED='false'
 # Real Time Monitoring identities (separated by comma)
 GLITE_LB_RTM_DN='/C=UK/O=eScience/OU=Imperial/L=Physics/CN=heppc24.hep.ph.ic.ac.uk/Email=janusz.martyniak@imperial.ac.uk'
 # MSG publish
-#GLITE_LB_MSG_BROKER=dev.msg.cern.ch:6166
+GLITE_LB_MSG_BROKER='tcp://egi-1.msg.cern.ch:6166'
 
 #
 # additional options

diff --git a/org.glite.lb.yaim/config/functions/config_glite_lb.in b/org.glite.lb.yaim/config/functions/config_glite_lb.in
index df4c36b..7fd8472 100644 (file)
--- a/org.glite.lb.yaim/config/functions/config_glite_lb.in
+++ b/org.glite.lb.yaim/config/functions/config_glite_lb.in
@@ -365,14 +365,16 @@ $logfile {
 EOF
 
   # MSG publish
-  if [ ! -z "$GLITE_LB_MSG_BROKER" ]; then
+  if [ "$GLITE_LB_MSG_BROKER" = 'false' ]; then
+    rm -f "$GLITE_LB_LOCATION_ETC/glite-lb/msg.conf"
+  else
     cat > "$GLITE_LB_LOCATION_ETC/glite-lb/msg.conf" <<EOF
 # automatically generated by yaim
 [interlogd]
 plugin = activemq_cpp_plugin.so
 
 [msg]
-broker = tcp://$GLITE_LB_MSG_BROKER
+broker = $GLITE_LB_MSG_BROKER
 EOF
   fi