From: Aleš Křenek Date: Tue, 10 Oct 2006 18:16:32 +0000 (+0000) Subject: - resolve duplicate -s X-Git-Tag: mergeto_glite-lb-client_branch_2_3_0_0243_generic_23Nov06~21 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=c6872061a8de4cbc4957e4409e3453264b3a60de;p=jra1mw.git - resolve duplicate -s - adapt to new maildir interface in sandbox handling --- diff --git a/org.glite.jp.client/src/jpimporter.c b/org.glite.jp.client/src/jpimporter.c index bd71d11..02078a2 100644 --- a/org.glite.jp.client/src/jpimporter.c +++ b/org.glite.jp.client/src/jpimporter.c @@ -115,7 +115,7 @@ static void usage(char *me) "\t-s, --sandbox-mdir path to the 'LB maildir' subtree for input/output sandboxes\n" "\t-i, --pidfile file to store master pid\n" "\t-t, --poll maildir polling interval (in seconds)\n", - "\t-s, --store keep uploaded jobs in this directory\n", + "\t-S, --store keep uploaded jobs in this directory\n", me); } @@ -168,7 +168,7 @@ int main(int argc, char *argv[]) case 'C': cadir = optarg; break; case 'p': jpps = optarg; break; case 't': poll = atoi(optarg); break; - case 's': store = optarg; break; + case 'S': store = optarg; break; case 'r': strcpy(reg_mdir, optarg); break; case 'd': strcpy(dump_mdir, optarg); break; case 's': strcpy(sandbox_mdir, optarg); break; @@ -559,11 +559,11 @@ static int sandbox_importer(void) if ( readnew ) ret = edg_wll_MaildirTransStart(sandbox_mdir, &msg, &fname); - else ret = edg_wll_MaildirRetryTransStart(sandbox_mdir, (time_t)60, &msg, &fname); + else ret = edg_wll_MaildirRetryTransStart(sandbox_mdir, (time_t)60, (time_t) 600,&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)60, &msg, &fname); + else ret = edg_wll_MaildirRetryTransStart(sandbox_mdir, (time_t)60, (time_t) 600,&msg, &fname); if ( !ret ) { readnew = ~readnew; return 0;