{N_("catalogs"), R_CATALOG},
{N_("schedules"), R_SCHEDULE},
{N_("filesets"), R_FILESET},
- {N_("groups"), R_GROUP},
{N_("pools"), R_POOL},
{N_("messages"), R_MSGS},
{N_("all"), -1},
/* List MEDIA or VOLUMES */
} else if (strcasecmp(ua->argk[i], _("media")) == 0 ||
strcasecmp(ua->argk[i], _("volumes")) == 0) {
- int done = FALSE;
+ bool done = false;
for (j=i+1; j<ua->argc; j++) {
if (strcasecmp(ua->argk[j], _("job")) == 0 && ua->argv[j]) {
bstrncpy(jr.Job, ua->argv[j], MAX_NAME_LENGTH);
n = db_get_job_volume_names(ua->jcr, ua->db, jobid, &VolumeName);
bsendmsg(ua, _("Jobid %d used %d Volume(s): %s\n"), jobid, n, VolumeName);
free_pool_memory(VolumeName);
- done = TRUE;
+ done = true;
}
/* if no job or jobid keyword found, then we list all media */
if (!done) {
POOL *pool;
RUN *run;
time_t runtime;
+ bool found = false;
i = find_arg_with_value(ua, "job");
if (i <= 0) {
}
}
}
- run = find_next_run(job, runtime);
- pool = run ? run->pool : NULL;
- if (!complete_jcr_for_job(jcr, job, pool)) {
- return 1;
- }
+ for (run=NULL; (run = find_next_run(run, job, runtime)); ) {
+ pool = run ? run->pool : NULL;
+ if (!complete_jcr_for_job(jcr, job, pool)) {
+ return 1;
+ }
- if (!find_next_volume_for_append(jcr, &mr, 0)) {
- bsendmsg(ua, "Could not find next Volume\n");
+ if (!find_next_volume_for_append(jcr, &mr, 0)) {
+ bsendmsg(ua, _("Could not find next Volume.\n"));
+ if (jcr->db) {
+ db_close_database(jcr, jcr->db);
+ jcr->db = NULL;
+ }
+ return 1;
+ } else {
+ bsendmsg(ua, _("The next Volume to be used by Job \"%s\" will be %s\n"),
+ job->hdr.name, mr.VolumeName);
+ found = true;
+ }
+ if (jcr->db) {
+ db_close_database(jcr, jcr->db);
+ jcr->db = NULL;
+ }
+ }
+ if (jcr->db) {
db_close_database(jcr, jcr->db);
jcr->db = NULL;
- return 1;
- } else {
- bsendmsg(ua, "The next Volume to be used by Job \"%s\" will be %s\n",
- job->hdr.name, mr.VolumeName);
}
- db_close_database(jcr, jcr->db);
- jcr->db = NULL;
+ if (!found) {
+ bsendmsg(ua, _("Could not find next Volume.\n"));
+ }
+ return 1;
} else {
bsendmsg(ua, _("Unknown list keyword: %s\n"), NPRT(ua->argk[i]));
}
* For a given job, we examine all his run records
* to see if it is scheduled today or tomorrow.
*/
-RUN *find_next_run(JOB *job, time_t &runtime)
+RUN *find_next_run(RUN *run, JOB *job, time_t &runtime)
{
time_t now, tomorrow;
- RUN *run;
SCHED *sched;
struct tm tm;
- int mday, wday, month, wpos, tmday, twday, tmonth, twpos, i, hour;
+ int mday, wday, month, wom, tmday, twday, tmonth, twom, i, hour;
+ int woy, twoy;
int tod, tom;
- Dmsg0(200, "enter find_runs()\n");
-
sched = job->schedule;
if (sched == NULL) { /* scheduled? */
return NULL; /* no nothing to report */
mday = tm.tm_mday - 1;
wday = tm.tm_wday;
month = tm.tm_mon;
- wpos = (tm.tm_mday - 1) / 7;
+ wom = mday / 7;
+ woy = tm_woy(now);
/* Break down tomorrow into components */
tomorrow = now + 60 * 60 * 24;
tmday = tm.tm_mday - 1;
twday = tm.tm_wday;
tmonth = tm.tm_mon;
- twpos = (tm.tm_mday - 1) / 7;
+ twom = tmday / 7;
+ twoy = tm_woy(tomorrow);
- for (run=sched->run; run; run=run->next) {
+ if (run == NULL) {
+ run = sched->run;
+ } else {
+ run = run->next;
+ }
+ for ( ; run; run=run->next) {
/*
* Find runs in next 24 hours
*/
tod = (bit_is_set(mday, run->mday) || bit_is_set(wday, run->wday)) &&
- bit_is_set(month, run->month) && bit_is_set(wpos, run->wpos);
+ bit_is_set(month, run->month) && bit_is_set(wom, run->wom) &&
+ bit_is_set(woy, run->woy);
tom = (bit_is_set(tmday, run->mday) || bit_is_set(twday, run->wday)) &&
- bit_is_set(tmonth, run->month) && bit_is_set(wpos, run->wpos);
+ bit_is_set(tmonth, run->month) && bit_is_set(twom, run->wom) &&
+ bit_is_set(twoy, run->woy);
- Dmsg2(200, "tod=%d tom=%d\n", tod, tom);
+// Dmsg2(200, "tod=%d tom=%d\n", tod, tom);
+// Dmsg2(200, "wom=%d twom=%d\n", wom, twom);
+// Dmsg1(200, "bit_set_wom=%d\n", bit_is_set(wom, run->wom));
if (tod) { /* Jobs scheduled today (next 24 hours) */
/* find time (time_t) job is to be run */
localtime_r(&now, &tm);
tm.tm_sec = 0;
runtime = mktime(&tm);
if (runtime > now) {
+ Dmsg2(000, "Found it level=%d %c\n", run->level, run->level);
return run; /* found it, return run resource */
}
}
tm.tm_min = run->minute;
tm.tm_sec = 0;
runtime = mktime(&tm);
- Dmsg2(200, "truntime=%d now=%d\n", runtime, now);
+// Dmsg2(200, "truntime=%d now=%d\n", runtime, now);
if (runtime < tomorrow) {
return run; /* found it, return run resource */
}
if (create_pool(jcr, jcr->db, jcr->pool, POOL_OP_CREATE) < 0) {
Jmsg(jcr, M_FATAL, 0, _("Pool %s not in database. %s"), pr.Name,
db_strerror(jcr->db));
- db_close_database(jcr, jcr->db);
- jcr->db = NULL;
+ if (jcr->db) {
+ db_close_database(jcr, jcr->db);
+ jcr->db = NULL;
+ }
return 0;
} else {
Jmsg(jcr, M_INFO, 0, _("Pool %s created in database.\n"), pr.Name);
len = bvsnprintf(msg, maxlen, fmt, arg_ptr);
va_end(arg_ptr);
if (len < 0 || len >= maxlen) {
- msg = realloc_pool_memory(msg, maxlen + 200);
+ msg = realloc_pool_memory(msg, maxlen + maxlen/2);
goto again;
}
if (bs) {
+ bs->msg = msg;
bs->msglen = len;
bnet_send(bs);
} else { /* No UA, send to Job */
projects / bacula / bacula / blobdiff