JP export should be disabled by default,

generate purge server dumps only when necessary, delete them after
JP export if there is not keeping directory configured

diff --git a/org.glite.lb.client/src/export.sh b/org.glite.lb.client/src/export.sh
index 15039f9..5e8775a 100644 (file)
--- a/org.glite.lb.client/src/export.sh
+++ b/org.glite.lb.client/src/export.sh
@@ -44,7 +44,7 @@ GLITE_LB_EXPORT_PURGE_ARGS=${GLITE_LB_EXPORT_PURGE_ARGS:---cleared 2d --aborted
 GLITE_LB_SERVER_PORT=${GLITE_LB_SERVER_PORT:-9000}
 GLITE_LB_EXPORT_BKSERVER=${GLITE_LB_EXPORT_BKSERVER:-localhost:$GLITE_LB_SERVER_PORT}
 GLITE_LB_PURGE_ENABLED=${GLITE_LB_PURGE_ENABLED:-true}
-GLITE_LB_EXPORT_ENABLED=${GLITE_LB_EXPORT_ENABLED:-true}
+GLITE_LB_EXPORT_ENABLED=${GLITE_LB_EXPORT_ENABLED:-false}
 
 [ -d $GLITE_LB_EXPORT_JPDUMP_MAILDIR ] || mkdir -p $GLITE_LB_EXPORT_JPDUMP_MAILDIR
 [ -d $GLITE_LB_EXPORT_DUMPDIR ] || mkdir -p $GLITE_LB_EXPORT_DUMPDIR
@@ -53,15 +53,21 @@ GLITE_LB_EXPORT_ENABLED=${GLITE_LB_EXPORT_ENABLED:-true}
 [ -d $GLITE_LB_EXPORT_PURGEDIR_KEEP ] || mkdir -p $GLITE_LB_EXPORT_PURGEDIR_KEEP
 [ -d $GLITE_LB_EXPORT_JOBSDIR ] || mkdir -p $GLITE_LB_EXPORT_JOBSDIR
 
+if [ x"$GLITE_LB_EXPORT_ENABLED" = x"true"  -o -d "$GLITE_LB_EXPORT_PURGEDIR_KEEP" ]
+then
+       GLITE_LB_EXPORT_PURGE_ARGS="$GLITE_LB_EXPORT_PURGE_ARGS -s"
+fi
+
 if [ x"$GLITE_LB_PURGE_ENABLED" = x"true" ]; then
-       X509_USER_CERT="$X509_USER_CERT" X509_USER_KEY="$X509_USER_KEY" $PREFIX/sbin/glite-lb-purge $GLITE_LB_EXPORT_PURGE_ARGS -l -m $GLITE_LB_EXPORT_BKSERVER -s $GLITE_LB_PURGE_OTHER_OPTIONS
+       X509_USER_CERT="$X509_USER_CERT" X509_USER_KEY="$X509_USER_KEY" $PREFIX/sbin/glite-lb-purge $GLITE_LB_EXPORT_PURGE_ARGS -l -m $GLITE_LB_EXPORT_BKSERVER $GLITE_LB_PURGE_OTHER_OPTIONS
 fi
 
-if [ x"$GLITE_LB_EXPORT_ENABLED" = x"true" ]; then
   list=`ls $GLITE_LB_EXPORT_PURGEDIR/* 2>/dev/null`
   for file in $list; do
     if [ -s $file ]; then
-      $PREFIX/sbin/glite-lb-lb_dump_exporter -d $file -s $GLITE_LB_EXPORT_JOBSDIR -m $GLITE_LB_EXPORT_JPDUMP_MAILDIR $GLITE_LB_DUMP_EXPORTER_OTHER_OPTIONS
+       if [ x"$GLITE_LB_EXPORT_ENABLED" = x"true" ]; then
+               $PREFIX/sbin/glite-lb-lb_dump_exporter -d $file -s $GLITE_LB_EXPORT_JOBSDIR -m $GLITE_LB_EXPORT_JPDUMP_MAILDIR $GLITE_LB_DUMP_EXPORTER_OTHER_OPTIONS
+       fi
       if [ -n "$GLITE_LB_EXPORT_PURGEDIR_KEEP" ]; then
         mv $file $GLITE_LB_EXPORT_PURGEDIR_KEEP
       else
@@ -72,6 +78,7 @@ if [ x"$GLITE_LB_EXPORT_ENABLED" = x"true" ]; then
     fi
   done
 
+if [ x"$GLITE_LB_EXPORT_ENABLED" = x"true" ]; then
   if [ -n "$GLITE_LB_EXPORT_DUMPDIR_KEEP" ]; then
     ls $GLITE_LB_EXPORT_DUMPDIR | xargs  -i'{}' cp $GLITE_LB_EXPORT_DUMPDIR/'{}' $GLITE_LB_EXPORT_DUMPDIR_KEEP;
   else