* Version $Id$
*/
/*
- Copyright (C) 2001-2005 Kern Sibbald
+ Copyright (C) 2001-2006 Kern Sibbald
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
#include "bacula.h"
#include "dird.h"
-extern char my_name[];
-extern time_t daemon_start_time;
-extern int num_jobs_run;
-
static void list_scheduled_jobs(UAContext *ua);
static void list_running_jobs(UAContext *ua);
static void list_terminated_jobs(UAContext *ua);
bsendmsg(ua, DotStatusJob, edit_int64(njcr->JobId, ed1),
njcr->JobStatus, njcr->JobErrors);
}
- free_jcr(njcr);
}
+ endeach_jcr(njcr);
} else if (strcasecmp(ua->argk[2], "last") == 0) {
bsendmsg(ua, OKqstatus, ua->argk[2]);
if ((last_jobs) && (last_jobs->size() > 0)) {
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;
i = 0;
foreach_res(store, R_STORAGE) {
found = false;
- if (!acl_access_ok(ua, Storage_ACL, store->hdr.name)) {
+ if (!acl_access_ok(ua, Storage_ACL, store->name())) {
continue;
}
for (j=0; j<i; j++) {
i = 0;
foreach_res(client, R_CLIENT) {
found = false;
- if (!acl_access_ok(ua, Client_ACL, client->hdr.name)) {
+ if (!acl_access_ok(ua, Client_ACL, client->name())) {
continue;
}
for (j=0; j<i; j++) {
{
BSOCK *sd;
- set_storage(ua->jcr, store);
+ set_wstorage(ua->jcr, store);
/* Try connecting for up to 15 seconds */
bsendmsg(ua, _("Connecting to Storage daemon %s at %s:%d\n"),
- store->hdr.name, store->address, store->SDport);
+ store->name(), store->address, store->SDport);
if (!connect_to_storage_daemon(ua->jcr, 1, 15, 0)) {
bsendmsg(ua, _("\nFailed to connect to Storage daemon %s.\n====\n"),
- store->hdr.name);
+ store->name());
if (ua->jcr->store_bsock) {
bnet_close(ua->jcr->store_bsock);
ua->jcr->store_bsock = NULL;
/* Try to connect for 15 seconds */
bsendmsg(ua, _("Connecting to Client %s at %s:%d\n"),
- client->hdr.name, client->address, client->FDport);
+ client->name(), client->address, client->FDport);
if (!connect_to_file_daemon(ua->jcr, 1, 15, 0)) {
bsendmsg(ua, _("Failed to connect to Client %s.\n====\n"),
- client->hdr.name);
+ client->name());
if (ua->jcr->file_bsock) {
bnet_close(ua->jcr->file_bsock);
ua->jcr->file_bsock = NULL;
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) {
}
bsendmsg(ua, _("%-14s %-8s %3d %-18s %-18s %s\n"),
level_ptr, job_type_to_str(sp->job->JobType), sp->priority, dt,
- sp->job->hdr.name, mr.VolumeName);
+ sp->job->name(), mr.VolumeName);
if (close_db) {
db_close_database(jcr, jcr->db);
}
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->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++;
}
Dmsg0(200, "enter list_run_jobs()\n");
bsendmsg(ua, _("\nRunning Jobs:\n"));
foreach_jcr(jcr) {
- njobs++;
if (jcr->JobId == 0) { /* this is us */
/* this is a console or other control job. We only show console
* jobs in the status output.
bstrftime_nc(dt, sizeof(dt), jcr->start_time);
bsendmsg(ua, _("Console connected at %s\n"), dt);
}
- njobs--;
- }
- free_jcr(jcr);
+ continue;
+ }
+ njobs++;
}
+ endeach_jcr(jcr);
+
if (njobs == 0) {
/* Note the following message is used in regress -- don't change */
bsendmsg(ua, _("No Jobs running.\n====\n"));
bsendmsg(ua, _(" JobId Level Name Status\n"));
bsendmsg(ua, _("======================================================================\n"));
foreach_jcr(jcr) {
- if (jcr->JobId == 0 || !acl_access_ok(ua, Job_ACL, jcr->job->hdr.name)) {
- free_jcr(jcr);
+ if (jcr->JobId == 0 || !acl_access_ok(ua, Job_ACL, jcr->job->name())) {
continue;
}
njobs++;
break;
case JS_WaitFD:
emsg = (char *) get_pool_memory(PM_FNAME);
- Mmsg(emsg, _("is waiting on Client %s"), jcr->client->hdr.name);
+ Mmsg(emsg, _("is waiting on Client %s"), jcr->client->name());
pool_mem = true;
msg = emsg;
break;
case JS_WaitSD:
emsg = (char *) get_pool_memory(PM_FNAME);
- Mmsg(emsg, _("is waiting on Storage %s"), jcr->store->hdr.name);
+ if (jcr->wstore) {
+ Mmsg(emsg, _("is waiting on Storage %s"), jcr->wstore->name());
+ } else {
+ Mmsg(emsg, _("is waiting on Storage %s"), jcr->rstore->name());
+ }
pool_mem = true;
msg = emsg;
break;
pool_mem = true;
}
Mmsg(emsg, _("is waiting for Client %s to connect to Storage %s"),
- jcr->client->hdr.name, jcr->store->hdr.name);
+ jcr->client->name(), jcr->wstore->name());
msg = emsg;
break;
}
free_pool_memory(emsg);
pool_mem = false;
}
- free_jcr(jcr);
}
+ endeach_jcr(jcr);
bsendmsg(ua, _("====\n"));
Dmsg0(200, "leave list_run_jobs()\n");
}