Dmsg1(20, "status:%s:\n", cmd);
for (i=1; i<ua->argc; i++) {
- if (strcasecmp(ua->argk[i], N_("all")) == 0) {
+ if (strcasecmp(ua->argk[i], NT_("all")) == 0) {
do_all_status(ua);
return 1;
- } else if (strcasecmp(ua->argk[i], N_("dir")) == 0 ||
- strcasecmp(ua->argk[i], N_("director")) == 0) {
+ } else if (strcasecmp(ua->argk[i], NT_("dir")) == 0 ||
+ strcasecmp(ua->argk[i], NT_("director")) == 0) {
do_director_status(ua);
return 1;
- } else if (strcasecmp(ua->argk[i], N_("client")) == 0) {
+ } else if (strcasecmp(ua->argk[i], NT_("client")) == 0) {
client = get_client_resource(ua);
if (client) {
do_client_status(ua, client);
char prmt[MAX_NAME_LENGTH];
start_prompt(ua, _("Status available for:\n"));
- add_prompt(ua, N_("Director"));
- add_prompt(ua, N_("Storage"));
- add_prompt(ua, N_("Client"));
- add_prompt(ua, N_("All"));
+ add_prompt(ua, NT_("Director"));
+ add_prompt(ua, NT_("Storage"));
+ add_prompt(ua, NT_("Client"));
+ add_prompt(ua, NT_("All"));
Dmsg0(20, "do_prompt: select daemon\n");
if ((item=do_prompt(ua, "", _("Select daemon type for status"), prmt, sizeof(prmt))) < 0) {
return 1;
int priority;
time_t runtime;
POOL *pool;
+ STORE *store;
};
static void prt_runtime(UAContext *ua, sched_pkt *sp)
close_db = true; /* new db opened, remember to close it */
}
if (ok) {
- mr.PoolId = jcr->PoolId;
+ mr.PoolId = jcr->jr.PoolId;
+ mr.StorageId = sp->store->StorageId;
ok = find_next_volume_for_append(jcr, &mr, 1, false/*no create*/);
}
if (!ok) {
time_t runtime;
RUN *run;
JOB *job;
+ STORE* store;
int level, num_jobs = 0;
int priority;
bool hdr_printed = false;
Dmsg0(200, "enter list_sched_jobs()\n");
days = 1;
- i = find_arg_with_value(ua, N_("days"));
+ i = find_arg_with_value(ua, NT_("days"));
if (i >= 0) {
days = atoi(ua->argv[i]);
if ((days < 0) || (days > 50)) {
/* Loop through all jobs */
LockRes();
foreach_res(job, R_JOB) {
- if (!acl_access_ok(ua, Job_ACL, job->hdr.name)) {
+ if (!acl_access_ok(ua, Job_ACL, job->hdr.name) || !job->enabled) {
continue;
}
for (run=NULL; (run = find_next_run(run, job, runtime, days)); ) {
if (run->Priority) {
priority = run->Priority;
}
+ if (run->storage) {
+ store = run->storage;
+ } else {
+ store = (STORE *)job->storage->first();
+ }
if (!hdr_printed) {
prt_runhdr(ua);
hdr_printed = true;
sp->priority = priority;
sp->runtime = runtime;
sp->pool = run->pool;
+ sp->store = store;
sched.binary_insert_multiple(sp, my_compare);
num_jobs++;
}