X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fua_status.c;h=b3c85c9d72e482fad31c48ec5295e809355cc9a7;hb=2d33910ffe9a56d8d74223733bb828c60282022b;hp=29eb20f6c8df42fa68ca53804008e3fb1beaa2fa;hpb=067183227472a9aadc841d14589c7ae79cea4506;p=bacula%2Fbacula diff --git a/bacula/src/dird/ua_status.c b/bacula/src/dird/ua_status.c index 29eb20f6c8..b3c85c9d72 100644 --- a/bacula/src/dird/ua_status.c +++ b/bacula/src/dird/ua_status.c @@ -6,34 +6,38 @@ * * Version $Id$ */ - /* - Copyright (C) 2000-2004 Kern Sibbald and John Walker + Bacula® - The Network Backup Solution + + Copyright (C) 2001-2006 Free Software Foundation Europe e.V. - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. + The main author of Bacula is Kern Sibbald, with contributions from + many others, a complete list can be found in the file AUTHORS. + This program is Free Software; you can redistribute it and/or + modify it under the terms of version two of the GNU General Public + License as published by the Free Software Foundation plus additions + that are listed in the file LICENSE. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. + + Bacula® is a registered trademark ofJohn Walker. + The licensor of Bacula is the Free Software Foundation Europe + (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, + Switzerland, email:ftf@fsfeurope.org. +*/ - */ #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); @@ -42,6 +46,52 @@ static void do_client_status(UAContext *ua, CLIENT *client); static void do_director_status(UAContext *ua); static void do_all_status(UAContext *ua); +static char OKqstatus[] = "1000 OK .status\n"; +static char DotStatusJob[] = "JobId=%s JobStatus=%c JobErrors=%d\n"; + +/* + * .status command + */ +int qstatus_cmd(UAContext *ua, const char *cmd) +{ + JCR* njcr = NULL; + s_last_job* job; + char ed1[50]; + + if (!open_db(ua)) { + return 1; + } + Dmsg1(20, "status:%s:\n", cmd); + + if ((ua->argc != 3) || (strcasecmp(ua->argk[1], "dir"))) { + bsendmsg(ua, "1900 Bad .status command, missing arguments.\n"); + return 1; + } + + if (strcasecmp(ua->argk[2], "current") == 0) { + bsendmsg(ua, OKqstatus, ua->argk[2]); + foreach_jcr(njcr) { + if (njcr->JobId != 0) { + bsendmsg(ua, DotStatusJob, edit_int64(njcr->JobId, ed1), + njcr->JobStatus, njcr->JobErrors); + } + } + endeach_jcr(njcr); + } else if (strcasecmp(ua->argk[2], "last") == 0) { + bsendmsg(ua, OKqstatus, ua->argk[2]); + if ((last_jobs) && (last_jobs->size() > 0)) { + job = (s_last_job*)last_jobs->last(); + bsendmsg(ua, DotStatusJob, edit_int64(job->JobId, ed1), + job->JobStatus, job->Errors); + } + } else { + bsendmsg(ua, "1900 Bad .status command, wrong argument.\n"); + return 1; + } + + return 1; +} + /* * status command */ @@ -57,62 +107,62 @@ int status_cmd(UAContext *ua, const char *cmd) Dmsg1(20, "status:%s:\n", cmd); for (i=1; iargc; i++) { - if (strcasecmp(ua->argk[i], _("all")) == 0) { - do_all_status(ua); - return 1; - } else if (strcasecmp(ua->argk[i], _("dir")) == 0 || - strcasecmp(ua->argk[i], _("director")) == 0) { - do_director_status(ua); - return 1; - } else if (strcasecmp(ua->argk[i], _("client")) == 0) { - client = get_client_resource(ua); - if (client) { - do_client_status(ua, client); - } - return 1; + if (strcasecmp(ua->argk[i], NT_("all")) == 0) { + do_all_status(ua); + return 1; + } 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], NT_("client")) == 0) { + client = get_client_resource(ua); + if (client) { + do_client_status(ua, client); + } + return 1; } else { - store = get_storage_resource(ua, 0); - if (store) { - do_storage_status(ua, store); - } - return 1; + store = get_storage_resource(ua, false/*no default*/); + if (store) { + do_storage_status(ua, store); + } + return 1; } } /* If no args, ask for status type */ - if (ua->argc == 1) { - char prmt[MAX_NAME_LENGTH]; - + if (ua->argc == 1) { + char prmt[MAX_NAME_LENGTH]; + start_prompt(ua, _("Status available for:\n")); - add_prompt(ua, _("Director")); - add_prompt(ua, _("Storage")); - add_prompt(ua, _("Client")); - add_prompt(ua, _("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; + return 1; } Dmsg1(20, "item=%d\n", item); - switch (item) { - case 0: /* Director */ - do_director_status(ua); - break; + switch (item) { + case 0: /* Director */ + do_director_status(ua); + break; case 1: - store = select_storage_resource(ua); - if (store) { - do_storage_status(ua, store); - } - break; + store = select_storage_resource(ua); + if (store) { + do_storage_status(ua, store); + } + break; case 2: - client = select_client_resource(ua); - if (client) { - do_client_status(ua, client); - } - break; + client = select_client_resource(ua); + if (client) { + do_client_status(ua, client); + } + break; case 3: - do_all_status(ua); - break; + do_all_status(ua); + break; default: - break; + break; } } return 1; @@ -134,22 +184,22 @@ static void do_all_status(UAContext *ua) i++; } unique_store = (STORE **) malloc(i * sizeof(STORE)); - /* Find Unique Storage address/port */ + /* Find Unique Storage address/port */ i = 0; foreach_res(store, R_STORAGE) { found = false; - if (!acl_access_ok(ua, Storage_ACL, store->hdr.name)) { - continue; + if (!acl_access_ok(ua, Storage_ACL, store->name())) { + continue; } for (j=0; jaddress, store->address) == 0 && - unique_store[j]->SDport == store->SDport) { - found = true; - break; - } + if (strcmp(unique_store[j]->address, store->address) == 0 && + unique_store[j]->SDport == store->SDport) { + found = true; + break; + } } if (!found) { - unique_store[i++] = store; + unique_store[i++] = store; Dmsg2(40, "Stuffing: %s:%d\n", store->address, store->SDport); } } @@ -168,22 +218,22 @@ static void do_all_status(UAContext *ua) i++; } unique_client = (CLIENT **)malloc(i * sizeof(CLIENT)); - /* Find Unique Client address/port */ + /* Find Unique Client address/port */ i = 0; foreach_res(client, R_CLIENT) { found = false; - if (!acl_access_ok(ua, Client_ACL, client->hdr.name)) { - continue; + if (!acl_access_ok(ua, Client_ACL, client->name())) { + continue; } for (j=0; jaddress, client->address) == 0 && - unique_client[j]->FDport == client->FDport) { - found = true; - break; - } + if (strcmp(unique_client[j]->address, client->address) == 0 && + unique_client[j]->FDport == client->FDport) { + found = true; + break; + } } if (!found) { - unique_client[i++] = client; + unique_client[i++] = client; Dmsg2(40, "Stuffing: %s:%d\n", client->address, client->FDport); } } @@ -194,58 +244,62 @@ static void do_all_status(UAContext *ua) do_client_status(ua, unique_client[j]); } free(unique_client); - + } static void do_director_status(UAContext *ua) { char dt[MAX_TIME_LENGTH]; + char b1[35], b2[35], b3[35], b4[35]; - bsendmsg(ua, "%s Version: " VERSION " (" BDATE ") %s %s %s\n", my_name, - HOST_OS, DISTNAME, DISTVER); + bsendmsg(ua, _("%s Version: %s (%s) %s %s %s\n"), my_name, VERSION, BDATE, + HOST_OS, DISTNAME, DISTVER); bstrftime_nc(dt, sizeof(dt), daemon_start_time); - bsendmsg(ua, _("Daemon started %s, %d Job%s run since started.\n"), - dt, num_jobs_run, num_jobs_run == 1 ? "" : "s"); - if (debug_level > 0) { - char b1[35], b2[35], b3[35], b4[35]; - bsendmsg(ua, _(" Heap: bytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"), - edit_uint64_with_commas(sm_bytes, b1), - edit_uint64_with_commas(sm_max_bytes, b2), - edit_uint64_with_commas(sm_buffers, b3), - edit_uint64_with_commas(sm_max_buffers, b4)); + if (num_jobs_run == 1) { + bsendmsg(ua, _("Daemon started %s, 1 Job run since started.\n"), dt); } + else { + bsendmsg(ua, _("Daemon started %s, %d Jobs run since started.\n"), + dt, num_jobs_run); + } + bsendmsg(ua, _(" Heap: bytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"), + edit_uint64_with_commas(sm_bytes, b1), + edit_uint64_with_commas(sm_max_bytes, b2), + edit_uint64_with_commas(sm_buffers, b3), + edit_uint64_with_commas(sm_max_buffers, b4)); + /* * List scheduled Jobs */ list_scheduled_jobs(ua); - /* + /* * List running jobs */ list_running_jobs(ua); - /* + /* * List terminated jobs */ list_terminated_jobs(ua); - bsendmsg(ua, "====\n"); + bsendmsg(ua, _("====\n")); } static void do_storage_status(UAContext *ua, STORE *store) { BSOCK *sd; - ua->jcr->store = 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); + bsendmsg(ua, _("Connecting to Storage daemon %s at %s:%d\n"), + 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; - } + bnet_close(ua->jcr->store_bsock); + ua->jcr->store_bsock = NULL; + } return; } Dmsg0(20, _("Connected to storage daemon\n")); @@ -257,9 +311,9 @@ static void do_storage_status(UAContext *ua, STORE *store) bnet_sig(sd, BNET_TERMINATE); bnet_close(sd); ua->jcr->store_bsock = NULL; - return; + return; } - + static void do_client_status(UAContext *ua, CLIENT *client) { BSOCK *fd; @@ -275,15 +329,15 @@ static void do_client_status(UAContext *ua, CLIENT *client) ua->jcr->sd_auth_key = bstrdup("dummy"); /* Try to connect for 15 seconds */ - bsendmsg(ua, _("Connecting to Client %s at %s:%d\n"), - client->hdr.name, client->address, client->FDport); + bsendmsg(ua, _("Connecting to Client %s at %s:%d\n"), + 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; - } + bnet_close(ua->jcr->file_bsock); + ua->jcr->file_bsock = NULL; + } return; } Dmsg0(20, _("Connected to file daemon\n")); @@ -296,7 +350,7 @@ static void do_client_status(UAContext *ua, CLIENT *client) bnet_close(fd); ua->jcr->file_bsock = NULL; - return; + return; } static void prt_runhdr(UAContext *ua) @@ -308,31 +362,36 @@ static void prt_runhdr(UAContext *ua) /* Scheduling packet */ struct sched_pkt { - dlink link; /* keep this as first item!!! */ + dlink link; /* keep this as first item!!! */ JOB *job; int level; int priority; time_t runtime; POOL *pool; + STORE *store; }; static void prt_runtime(UAContext *ua, sched_pkt *sp) { - char dt[MAX_TIME_LENGTH]; + char dt[MAX_TIME_LENGTH]; const char *level_ptr; bool ok = false; bool close_db = false; JCR *jcr = ua->jcr; MEDIA_DBR mr; + memset(&mr, 0, sizeof(mr)); if (sp->job->JobType == JT_BACKUP) { jcr->db = NULL; ok = complete_jcr_for_job(jcr, sp->job, sp->pool); if (jcr->db) { - close_db = true; /* new db opened, remember to close it */ + close_db = true; /* new db opened, remember to close it */ } if (ok) { - ok = find_next_volume_for_append(jcr, &mr, 0); + mr.PoolId = jcr->jr.PoolId; + mr.StorageId = sp->store->StorageId; + jcr->wstore = sp->store; + ok = find_next_volume_for_append(jcr, &mr, 1, false/*no create*/); } if (!ok) { bstrncpy(mr.VolumeName, "*unknown*", sizeof(mr.VolumeName)); @@ -348,14 +407,13 @@ static void prt_runtime(UAContext *ua, sched_pkt *sp) level_ptr = level_to_str(sp->level); break; } - 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); + bsendmsg(ua, _("%-14s %-8s %3d %-18s %-18s %s\n"), + level_ptr, job_type_to_str(sp->job->JobType), sp->priority, dt, + sp->job->name(), mr.VolumeName); if (close_db) { db_close_database(jcr, jcr->db); } - jcr->db = ua->db; /* restore ua db to jcr */ - + jcr->db = ua->db; /* restore ua db to jcr */ } /* @@ -369,7 +427,7 @@ static int my_compare(void *item1, void *item2) return -1; } else if (p1->runtime > p2->runtime) { return 1; - } + } if (p1->priority < p2->priority) { return -1; } else if (p1->priority > p2->priority) { @@ -378,7 +436,7 @@ static int my_compare(void *item1, void *item2) return 0; } -/* +/* * Find all jobs to be run in roughly the * next 24 hours. */ @@ -387,41 +445,59 @@ static void list_scheduled_jobs(UAContext *ua) time_t runtime; RUN *run; JOB *job; + STORE* store; int level, num_jobs = 0; int priority; bool hdr_printed = false; dlist sched; sched_pkt *sp; + int days, i; Dmsg0(200, "enter list_sched_jobs()\n"); + days = 1; + i = find_arg_with_value(ua, NT_("days")); + if (i >= 0) { + days = atoi(ua->argv[i]); + if ((days < 0) || (days > 50)) { + bsendmsg(ua, _("Ignoring illegal value for days.\n")); + days = 1; + } + } + /* Loop through all jobs */ LockRes(); foreach_res(job, R_JOB) { - if (!acl_access_ok(ua, Job_ACL, job->hdr.name)) { - continue; + if (!acl_access_ok(ua, Job_ACL, job->name()) || !job->enabled) { + continue; } - for (run=NULL; (run = find_next_run(run, job, runtime)); ) { - level = job->level; - if (run->level) { - level = run->level; - } - priority = job->Priority; - if (run->Priority) { - priority = run->Priority; - } - if (!hdr_printed) { - prt_runhdr(ua); - hdr_printed = true; - } - sp = (sched_pkt *)malloc(sizeof(sched_pkt)); - sp->job = job; - sp->level = level; - sp->priority = priority; - sp->runtime = runtime; - sp->pool = run->pool; - sched.binary_insert(sp, my_compare); - num_jobs++; + for (run=NULL; (run = find_next_run(run, job, runtime, days)); ) { + level = job->JobLevel; + if (run->level) { + level = run->level; + } + priority = job->Priority; + 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 = (sched_pkt *)malloc(sizeof(sched_pkt)); + sp->job = job; + sp->level = level; + sp->priority = priority; + sp->runtime = runtime; + sp->pool = run->pool; + sp->store = store; + sched.binary_insert_multiple(sp, my_compare); + num_jobs++; } } /* end for loop over resources */ UnlockRes(); @@ -430,8 +506,8 @@ static void list_scheduled_jobs(UAContext *ua) } if (num_jobs == 0) { bsendmsg(ua, _("No Scheduled Jobs.\n")); - } - bsendmsg(ua, "====\n"); + } + bsendmsg(ua, _("====\n")); Dmsg0(200, "Leave list_sched_jobs_runs()\n"); } @@ -440,30 +516,29 @@ static void list_running_jobs(UAContext *ua) JCR *jcr; int njobs = 0; const char *msg; - char *emsg; /* edited message */ + char *emsg; /* edited message */ char dt[MAX_TIME_LENGTH]; char level[10]; bool pool_mem = false; Dmsg0(200, "enter list_run_jobs()\n"); bsendmsg(ua, _("\nRunning Jobs:\n")); - lock_jcr_chain(); 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. - */ - if (jcr->JobType == JT_CONSOLE) { - bstrftime_nc(dt, sizeof(dt), jcr->start_time); + if (jcr->JobId == 0) { /* this is us */ + /* this is a console or other control job. We only show console + * jobs in the status output. + */ + if (jcr->JobType == JT_CONSOLE) { + bstrftime_nc(dt, sizeof(dt), jcr->start_time); bsendmsg(ua, _("Console connected at %s\n"), dt); - } - njobs--; - } - free_locked_jcr(jcr); + } + continue; + } + njobs++; } + endeach_jcr(jcr); + if (njobs == 0) { - unlock_jcr_chain(); /* Note the following message is used in regress -- don't change */ bsendmsg(ua, _("No Jobs running.\n====\n")); Dmsg0(200, "leave list_run_jobs()\n"); @@ -473,130 +548,132 @@ static void list_running_jobs(UAContext *ua) 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_locked_jcr(jcr); - continue; + if (jcr->JobId == 0 || !acl_access_ok(ua, Job_ACL, jcr->job->name())) { + continue; } njobs++; switch (jcr->JobStatus) { case JS_Created: msg = _("is waiting execution"); - break; + break; case JS_Running: msg = _("is running"); - break; + break; case JS_Blocked: msg = _("is blocked"); - break; + break; case JS_Terminated: msg = _("has terminated"); - break; + break; case JS_ErrorTerminated: msg = _("has erred"); - break; + break; case JS_Error: msg = _("has errors"); - break; + break; case JS_FatalError: msg = _("has a fatal error"); - break; + break; case JS_Differences: msg = _("has verify differences"); - break; + break; case JS_Canceled: msg = _("has been canceled"); - break; + break; case JS_WaitFD: - emsg = (char *) get_pool_memory(PM_FNAME); - Mmsg(&emsg, _("is waiting on Client %s"), jcr->client->hdr.name); - pool_mem = true; - msg = emsg; - break; + emsg = (char *) get_pool_memory(PM_FNAME); + 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); - pool_mem = true; - msg = emsg; - break; + emsg = (char *) get_pool_memory(PM_FNAME); + 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; case JS_WaitStoreRes: msg = _("is waiting on max Storage jobs"); - break; + break; case JS_WaitClientRes: msg = _("is waiting on max Client jobs"); - break; + break; case JS_WaitJobRes: msg = _("is waiting on max Job jobs"); - break; + break; case JS_WaitMaxJobs: msg = _("is waiting on max total jobs"); - break; + break; case JS_WaitStartTime: msg = _("is waiting for its start time"); - break; + break; case JS_WaitPriority: msg = _("is waiting for higher priority jobs to finish"); - break; + break; default: - emsg = (char *) get_pool_memory(PM_FNAME); - Mmsg(&emsg, _("is in unknown state %c"), jcr->JobStatus); - pool_mem = true; - msg = emsg; - break; + emsg = (char *) get_pool_memory(PM_FNAME); + Mmsg(emsg, _("is in unknown state %c"), jcr->JobStatus); + pool_mem = true; + msg = emsg; + break; } - /* - * Now report Storage daemon status code + /* + * Now report Storage daemon status code */ switch (jcr->SDJobStatus) { case JS_WaitMount: - if (pool_mem) { - free_pool_memory(emsg); - pool_mem = false; - } + if (pool_mem) { + free_pool_memory(emsg); + pool_mem = false; + } msg = _("is waiting for a mount request"); - break; + break; case JS_WaitMedia: - if (pool_mem) { - free_pool_memory(emsg); - pool_mem = false; - } + if (pool_mem) { + free_pool_memory(emsg); + pool_mem = false; + } msg = _("is waiting for an appendable Volume"); - break; + break; case JS_WaitFD: - if (!pool_mem) { - emsg = (char *) get_pool_memory(PM_FNAME); - pool_mem = true; - } - Mmsg(&emsg, _("is waiting for Client %s to connect to Storage %s"), - jcr->client->hdr.name, jcr->store->hdr.name); - msg = emsg; - break; + if (!pool_mem) { + emsg = (char *) get_pool_memory(PM_FNAME); + pool_mem = true; + } + Mmsg(emsg, _("is waiting for Client %s to connect to Storage %s"), + jcr->client->name(), jcr->wstore->name()); + msg = emsg; + break; } switch (jcr->JobType) { case JT_ADMIN: case JT_RESTORE: bstrncpy(level, " ", sizeof(level)); - break; + break; default: - bstrncpy(level, level_to_str(jcr->JobLevel), sizeof(level)); - level[7] = 0; - break; + bstrncpy(level, level_to_str(jcr->JobLevel), sizeof(level)); + level[7] = 0; + break; } - bsendmsg(ua, _("%6d %-6s %-20s %s\n"), - jcr->JobId, - level, - jcr->Job, - msg); + bsendmsg(ua, _("%6d %-6s %-20s %s\n"), + jcr->JobId, + level, + jcr->Job, + msg); if (pool_mem) { - free_pool_memory(emsg); - pool_mem = false; + free_pool_memory(emsg); + pool_mem = false; } - free_locked_jcr(jcr); } - unlock_jcr_chain(); - bsendmsg(ua, "====\n"); + endeach_jcr(jcr); + bsendmsg(ua, _("====\n")); Dmsg0(200, "leave list_run_jobs()\n"); } @@ -612,60 +689,65 @@ static void list_terminated_jobs(UAContext *ua) lock_last_jobs_list(); struct s_last_job *je; bsendmsg(ua, _("\nTerminated Jobs:\n")); - bsendmsg(ua, _(" JobId Level Files Bytes Status Finished Name \n")); - bsendmsg(ua, _("========================================================================\n")); + bsendmsg(ua, _(" JobId Level Files Bytes Status Finished Name \n")); + bsendmsg(ua, _("====================================================================\n")); foreach_dlist(je, last_jobs) { char JobName[MAX_NAME_LENGTH]; const char *termstat; + bstrncpy(JobName, je->Job, sizeof(JobName)); + /* There are three periods after the Job name */ + char *p; + for (int i=0; i<3; i++) { + if ((p=strrchr(JobName, '.')) != NULL) { + *p = 0; + } + } + + if (!acl_access_ok(ua, Job_ACL, JobName)) { + continue; + } + bstrftime_nc(dt, sizeof(dt), je->end_time); switch (je->JobType) { case JT_ADMIN: case JT_RESTORE: bstrncpy(level, " ", sizeof(level)); - break; + break; default: - bstrncpy(level, level_to_str(je->JobLevel), sizeof(level)); - level[4] = 0; - break; + bstrncpy(level, level_to_str(je->JobLevel), sizeof(level)); + level[4] = 0; + break; } switch (je->JobStatus) { case JS_Created: - termstat = "Created"; - break; + termstat = _("Created"); + break; case JS_FatalError: case JS_ErrorTerminated: - termstat = "Error"; - break; + termstat = _("Error"); + break; case JS_Differences: - termstat = "Diffs"; - break; + termstat = _("Diffs"); + break; case JS_Canceled: - termstat = "Cancel"; - break; + termstat = _("Cancel"); + break; case JS_Terminated: - termstat = "OK"; - break; + termstat = _("OK"); + break; default: - termstat = "Other"; - break; - } - bstrncpy(JobName, je->Job, sizeof(JobName)); - /* There are three periods after the Job name */ - char *p; - for (int i=0; i<3; i++) { - if ((p=strrchr(JobName, '.')) != NULL) { - *p = 0; - } + termstat = _("Other"); + break; } - bsendmsg(ua, _("%6d %-6s %8s %14s %-7s %-8s %s\n"), - je->JobId, - level, - edit_uint64_with_commas(je->JobFiles, b1), - edit_uint64_with_commas(je->JobBytes, b2), - termstat, - dt, JobName); - } - bsendmsg(ua, "\n"); + bsendmsg(ua, _("%6d %-6s %8s %10s %-7s %-8s %s\n"), + je->JobId, + level, + edit_uint64_with_commas(je->JobFiles, b1), + edit_uint64_with_suffix(je->JobBytes, b2), + termstat, + dt, JobName); + } + bsendmsg(ua, _("\n")); unlock_last_jobs_list(); }