From 9874692df410f364a3d7062d1dafdbcd6880c75e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Wed, 17 Oct 2007 09:20:15 +0000 Subject: [PATCH] merge cleanup --- org.glite.lb.client/src/export.sh | 20 +------------------- org.glite.lb.client/src/producer.c | 4 ---- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/org.glite.lb.client/src/export.sh b/org.glite.lb.client/src/export.sh index 7e21d95..362d119 100644 --- a/org.glite.lb.client/src/export.sh +++ b/org.glite.lb.client/src/export.sh @@ -53,38 +53,20 @@ 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 -<<<<<<< TODO: merge export.sh if [ x"$GLITE_LB_PURGE_ENABLED" = x"true" ]; then X509_USER_CERT="$X509_USER_CERT" X509_USER_KEY="$X509_USER_KEY" $PREFIX/bin/glite-lb-purge $GLITE_LB_EXPORT_PURGE_ARGS -l -m $GLITE_LB_EXPORT_BKSERVER -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 -fi ->>>>>>> 1.2.4.2 -<<<<<<< TODO: merge export.sh -if [ x"$GLITE_LB_EXPORT_ENABLED" = x"true" ]; then - for file in $GLITE_LB_EXPORT_PURGEDIR/*; do - if [ -s $file ]; then - $PREFIX/bin/glite-lb-dump_exporter -d $file -s $GLITE_LB_EXPORT_JOBSDIR -m $GLITE_LB_EXPORT_JPDUMP_MAILDIR - if [ -n "$GLITE_LB_EXPORT_PURGEDIR_KEEP" ]; then - mv $file $GLITE_LB_EXPORT_PURGEDIR_KEEP - else - rm $file - 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 + $PREFIX/bin/glite-lb-dump_exporter -d $file -s $GLITE_LB_EXPORT_JOBSDIR -m $GLITE_LB_EXPORT_JPDUMP_MAILDIR if [ -n "$GLITE_LB_EXPORT_PURGEDIR_KEEP" ]; then mv $file $GLITE_LB_EXPORT_PURGEDIR_KEEP else rm $file fi ->>>>>>> 1.2.4.2 else rm $file fi diff --git a/org.glite.lb.client/src/producer.c b/org.glite.lb.client/src/producer.c index c16dfbf..cd3b6ed 100644 --- a/org.glite.lb.client/src/producer.c +++ b/org.glite.lb.client/src/producer.c @@ -1122,10 +1122,6 @@ int edg_wll_RegisterSubjob( const char * seed, edg_wlc_JobId ** subjobs) { -/* TODO: merge - do we want subjobs to be registered - directly to bkserver (LOGFLAG_DIRECT) - or "just" through the locallogger (LOGFLAG_LOCAL) ? -*/ return edg_wll_RegisterJobMaster(ctx,EDG_WLL_LOGFLAG_LOCAL,job,type,jdl,ns,parent,num_subjobs,seed,subjobs); } -- 1.8.2.3