From a891c91088d689713dbf291ffdbb6f517ea9b75a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Wed, 26 Mar 2008 15:54:15 +0000 Subject: [PATCH] Switch JP to lbjp-common.maildir. --- org.glite.jp.client/Makefile | 4 +- org.glite.jp.client/examples/jpps_upload_files.c | 1 + org.glite.jp.client/examples/mill_feed.c | 6 +-- org.glite.jp.client/src/jpimp_lib.c | 13 +++--- org.glite.jp.client/src/jpimporter.c | 50 ++++++++++++------------ 5 files changed, 38 insertions(+), 36 deletions(-) diff --git a/org.glite.jp.client/Makefile b/org.glite.jp.client/Makefile index a1a869e..45d1a16 100644 --- a/org.glite.jp.client/Makefile +++ b/org.glite.jp.client/Makefile @@ -69,7 +69,7 @@ gsoap_bin_prefix:=${shell if [ -x ${gsoap_prefix}/bin/soapcpp2 ]; then echo ${g dotless_gsoap_ver:=${shell echo ${gsoap_version} | tr -d . } GSOAPLIB:=-lglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour} -LBMAILDIRLIB:=-lglite_lb_maildir +LBMAILDIRLIB:=-lglite_lbu_maildir offset=0 version_info:=-version-info ${shell \ @@ -94,7 +94,7 @@ jpps_upload_files: %: %.o ${LINK} -o $@ $< ${LIB} ${LBMAILDIRLIB} mill_feed: %: %.o - ${LINK} -o $@ $< ${LBMAILDIRLIB} -lglite_lb_common_${nothrflavour} + ${LINK} -o $@ $< ${LBMAILDIRLIB} -lglite_jobid diff --git a/org.glite.jp.client/examples/jpps_upload_files.c b/org.glite.jp.client/examples/jpps_upload_files.c index 48ff776..002386f 100644 --- a/org.glite.jp.client/examples/jpps_upload_files.c +++ b/org.glite.jp.client/examples/jpps_upload_files.c @@ -1,6 +1,7 @@ #include #include #include +#include #include "jp_client.h" #include "jpimporter.h" diff --git a/org.glite.jp.client/examples/mill_feed.c b/org.glite.jp.client/examples/mill_feed.c index c24c9e5..9a8bea0 100644 --- a/org.glite.jp.client/examples/mill_feed.c +++ b/org.glite.jp.client/examples/mill_feed.c @@ -11,7 +11,7 @@ #include #include "jp_client.h" #include "jpimporter.h" -#include "glite/lb/lb_maildir.h" +#include "glite/lbu/maildir.h" #include "glite/jobid/cjobid.h" @@ -174,7 +174,7 @@ static int register_init() { if (!env) env = USER; user = strdup(env); - if (edg_wll_MaildirInit(jpreg_dir) != 0) { + if (glite_lbu_MaildirInit(jpreg_dir) != 0) { fprintf(stderr, "maildir init on %s failed\n", jpreg_dir); return EIO; } @@ -198,7 +198,7 @@ static int register_add(const char *jobid, char **new_jobid) { asprintf(&msg, "%s\n%s", tmpjobid, user); if (new_jobid) *new_jobid = tmpjobid; else free(tmpjobid); - if (edg_wll_MaildirStoreMsg(jpreg_dir, BKSERVER, msg) != 0) { + if (glite_lbu_MaildirStoreMsg(jpreg_dir, BKSERVER, msg) != 0) { fprintf(stderr, "Can't store message: %s\n", lbm_errdesc); return EIO; } diff --git a/org.glite.jp.client/src/jpimp_lib.c b/org.glite.jp.client/src/jpimp_lib.c index 974c0dc..4319643 100644 --- a/org.glite.jp.client/src/jpimp_lib.c +++ b/org.glite.jp.client/src/jpimp_lib.c @@ -6,6 +6,7 @@ #include #include #include +#include #define COMPILE_WITH_LIBTAR @@ -13,7 +14,7 @@ # include #endif -#include "glite/lb/lb_maildir.h" +#include "glite/lbu/maildir.h" #include "jp_client.h" #include "jpimporter.h" @@ -43,8 +44,8 @@ int glite_jpimporter_upload_files( /* TODO: get the user proxy if it is not specified and find its location */ assert(proxy != NULL); - if ( edg_wll_MaildirInit(ctx->lbmd_dir) ) { - asprintf(&errs, "edg_wll_MaildirInit(): %s", lbm_errdesc); + if ( glite_lbu_MaildirInit(ctx->lbmd_dir) ) { + asprintf(&errs, "glite_lbu_MaildirInit(): %s", lbm_errdesc); glite_jpcl_SetError(ctx, errno, errs); free(errs); return -1; @@ -56,7 +57,7 @@ int glite_jpimporter_upload_files( glite_jpcl_SetError(ctx, ECANCELED, "Can't create temporary tar file"); return -1; } - snprintf(archive, PATH_MAX, "%s_%ld_%ld.tar", + snprintf(archive, PATH_MAX, "%s_%d_%ld.tar", TEMP_FILE_PREFIX, getpid(), time(NULL)); if ( (fd = open(archive, O_CREAT|O_EXCL|O_WRONLY, 00600)) < 0 ) { if ( errno == EEXIST ) { sleep(2); continue; } @@ -93,8 +94,8 @@ int glite_jpimporter_upload_files( asprintf(&msg, "jobid\t%s\nfile\t%s\nproxy\t%s\n", jobid, archive, proxy); - if ( edg_wll_MaildirStoreMsg(ctx->lbmd_dir, "localhost", msg) ) { - asprintf(&errs, "edg_wll_MaildirStoreMsg(): %s", lbm_errdesc); + if ( glite_lbu_MaildirStoreMsg(ctx->lbmd_dir, "localhost", msg) ) { + asprintf(&errs, "glite_lbu_MaildirStoreMsg(): %s", lbm_errdesc); glite_jpcl_SetError(ctx, errno, errs); rv = -1; goto cleanup; diff --git a/org.glite.jp.client/src/jpimporter.c b/org.glite.jp.client/src/jpimporter.c index 94a21d1..a1d4a88 100644 --- a/org.glite.jp.client/src/jpimporter.c +++ b/org.glite.jp.client/src/jpimporter.c @@ -16,7 +16,7 @@ #include #include -#include "glite/lb/lb_maildir.h" +#include "glite/lbu/maildir.h" #include "jpps_H.h" #include "jpps_.nsmap" @@ -225,9 +225,9 @@ int main(int argc, char *argv[]) fprintf(fpid, "%d", getpid()); fclose(fpid); - edg_wll_MaildirInit(reg_mdir); - edg_wll_MaildirInit(dump_mdir); - edg_wll_MaildirInit(sandbox_mdir); + glite_lbu_MaildirInit(reg_mdir); + glite_lbu_MaildirInit(dump_mdir); + glite_lbu_MaildirInit(sandbox_mdir); if (store && *store) { if (mkdir(store, 0750) != 0 && errno != EEXIST) { fprintf(stderr, "Can't create directory %s: %s\n", store, strerror(errno)); @@ -422,12 +422,12 @@ static int reg_importer(void) *fname = NULL, *aux; - if ( readnew ) ret = edg_wll_MaildirTransStart(reg_mdir, &msg, &fname); - else ret = edg_wll_MaildirRetryTransStart(reg_mdir, (time_t)JPREG_REPEAT_TIMEOUT, (time_t)JPREG_GIVUP_TIMEOUT, &msg, &fname); + if ( readnew ) ret = glite_lbu_MaildirTransStart(reg_mdir, &msg, &fname); + else ret = glite_lbu_MaildirRetryTransStart(reg_mdir, (time_t)JPREG_REPEAT_TIMEOUT, (time_t)JPREG_GIVUP_TIMEOUT, &msg, &fname); if ( !ret ) { readnew = !readnew; - if ( readnew ) ret = edg_wll_MaildirTransStart(reg_mdir, &msg, &fname); - else ret = edg_wll_MaildirRetryTransStart(reg_mdir, (time_t)JPREG_REPEAT_TIMEOUT, (time_t)JPREG_GIVUP_TIMEOUT, &msg, &fname); + if ( readnew ) ret = glite_lbu_MaildirTransStart(reg_mdir, &msg, &fname); + else ret = glite_lbu_MaildirRetryTransStart(reg_mdir, (time_t)JPREG_REPEAT_TIMEOUT, (time_t)JPREG_GIVUP_TIMEOUT, &msg, &fname); if ( !ret ) { readnew = !readnew; return 0; @@ -435,8 +435,8 @@ static int reg_importer(void) } if ( ret < 0 ) { - dprintf("[%s] edg_wll_MaildirTransStart: %s (%s)\n", name, strerror(errno), lbm_errdesc); - if ( !debug ) syslog(LOG_ERR, "edg_wll_MaildirTransStart: %s (%s)", strerror(errno), lbm_errdesc); + dprintf("[%s] glite_lbu_MaildirTransStart: %s (%s)\n", name, strerror(errno), lbm_errdesc); + if ( !debug ) syslog(LOG_ERR, "glite_lbu_MaildirTransStart: %s (%s)", strerror(errno), lbm_errdesc); return -1; } else if ( ret > 0 ) { dprintf("[%s] JP registration request received\n", name); @@ -478,7 +478,7 @@ static int reg_importer(void) } #endif } while (0); - edg_wll_MaildirTransEnd(reg_mdir, fname, ret? LBMD_TRANS_FAILED_RETRY: LBMD_TRANS_OK); + glite_lbu_MaildirTransEnd(reg_mdir, fname, ret? LBMD_TRANS_FAILED_RETRY: LBMD_TRANS_OK); free(fname); free(msg); return 1; @@ -512,12 +512,12 @@ static int dump_importer(void) #define _proxy 3 - if ( readnew ) ret = edg_wll_MaildirTransStart(dump_mdir, &msg, &fname); - else ret = edg_wll_MaildirRetryTransStart(dump_mdir, (time_t)JP_REPEAT_TIMEOUT, (time_t)JP_GIVUP_TIMEOUT, &msg, &fname); + if ( readnew ) ret = glite_lbu_MaildirTransStart(dump_mdir, &msg, &fname); + else ret = glite_lbu_MaildirRetryTransStart(dump_mdir, (time_t)JP_REPEAT_TIMEOUT, (time_t)JP_GIVUP_TIMEOUT, &msg, &fname); if ( !ret ) { readnew = !readnew; - if ( readnew ) ret = edg_wll_MaildirTransStart(dump_mdir, &msg, &fname); - else ret = edg_wll_MaildirRetryTransStart(dump_mdir, (time_t)JP_REPEAT_TIMEOUT, (time_t)JP_GIVUP_TIMEOUT, &msg, &fname); + if ( readnew ) ret = glite_lbu_MaildirTransStart(dump_mdir, &msg, &fname); + else ret = glite_lbu_MaildirRetryTransStart(dump_mdir, (time_t)JP_REPEAT_TIMEOUT, (time_t)JP_GIVUP_TIMEOUT, &msg, &fname); if ( !ret ) { readnew = !readnew; return 0; @@ -525,8 +525,8 @@ static int dump_importer(void) } if ( ret < 0 ) { - dprintf("[%s] edg_wll_MaildirTransStart: %s (%s)\n", name, strerror(errno), lbm_errdesc); - if ( !debug ) syslog(LOG_ERR, "edg_wll_MaildirTransStart: %s (%s)", strerror(errno), lbm_errdesc); + dprintf("[%s] glite_lbu_MaildirTransStart: %s (%s)\n", name, strerror(errno), lbm_errdesc); + if ( !debug ) syslog(LOG_ERR, "glite_lbu_MaildirTransStart: %s (%s)", strerror(errno), lbm_errdesc); return -1; } @@ -619,7 +619,7 @@ static int dump_importer(void) } } while (0); - edg_wll_MaildirTransEnd(dump_mdir, fname, ret? LBMD_TRANS_FAILED_RETRY: LBMD_TRANS_OK); + glite_lbu_MaildirTransEnd(dump_mdir, fname, ret? LBMD_TRANS_FAILED_RETRY: LBMD_TRANS_OK); free(fname); free(msg); @@ -652,12 +652,12 @@ static int sandbox_importer(void) #define _proxy 3 - if ( readnew ) ret = edg_wll_MaildirTransStart(sandbox_mdir, &msg, &fname); - else ret = edg_wll_MaildirRetryTransStart(sandbox_mdir, (time_t)JP_REPEAT_TIMEOUT, (time_t)JP_GIVUP_TIMEOUT ,&msg, &fname); + if ( readnew ) ret = glite_lbu_MaildirTransStart(sandbox_mdir, &msg, &fname); + else ret = glite_lbu_MaildirRetryTransStart(sandbox_mdir, (time_t)JP_REPEAT_TIMEOUT, (time_t)JP_GIVUP_TIMEOUT ,&msg, &fname); if ( !ret ) { readnew = !readnew; - if ( readnew ) ret = edg_wll_MaildirTransStart(sandbox_mdir, &msg, &fname); - else ret = edg_wll_MaildirRetryTransStart(sandbox_mdir, (time_t)JP_REPEAT_TIMEOUT, (time_t)JP_GIVUP_TIMEOUT ,&msg, &fname); + if ( readnew ) ret = glite_lbu_MaildirTransStart(sandbox_mdir, &msg, &fname); + else ret = glite_lbu_MaildirRetryTransStart(sandbox_mdir, (time_t)JP_REPEAT_TIMEOUT, (time_t)JP_GIVUP_TIMEOUT ,&msg, &fname); if ( !ret ) { readnew = !readnew; return 0; @@ -665,8 +665,8 @@ static int sandbox_importer(void) } if ( ret < 0 ) { - dprintf("[%s] edg_wll_MaildirTransStart: %s (%s)\n", name, strerror(errno), lbm_errdesc); - if ( !debug ) syslog(LOG_ERR, "edg_wll_MaildirTransStart: %s (%s)", strerror(errno), lbm_errdesc); + dprintf("[%s] glite_lbu_MaildirTransStart: %s (%s)\n", name, strerror(errno), lbm_errdesc); + if ( !debug ) syslog(LOG_ERR, "glite_lbu_MaildirTransStart: %s (%s)", strerror(errno), lbm_errdesc); return -1; } @@ -718,7 +718,7 @@ static int sandbox_importer(void) #endif } while (0); - edg_wll_MaildirTransEnd(sandbox_mdir, fname, ret? LBMD_TRANS_FAILED_RETRY: LBMD_TRANS_OK); + glite_lbu_MaildirTransEnd(sandbox_mdir, fname, ret? LBMD_TRANS_FAILED_RETRY: LBMD_TRANS_OK); free(fname); free(msg); -- 1.8.2.3