X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fua_status.c;h=b3c85c9d72e482fad31c48ec5295e809355cc9a7;hb=2d33910ffe9a56d8d74223733bb828c60282022b;hp=49ddebd316e4c8f4b680649e4c40f2621ba0a1d5;hpb=8e94b30da91f44a8a0d39de5c493983cfd08884e;p=bacula%2Fbacula diff --git a/bacula/src/dird/ua_status.c b/bacula/src/dird/ua_status.c index 49ddebd316..b3c85c9d72 100644 --- a/bacula/src/dird/ua_status.c +++ b/bacula/src/dird/ua_status.c @@ -7,19 +7,32 @@ * Version $Id$ */ /* - Copyright (C) 2001-2006 Kern Sibbald + Bacula® - The Network Backup Solution - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - version 2 as amended with additional clauses defined in the - file LICENSE in the main source directory. + Copyright (C) 2001-2006 Free Software Foundation Europe e.V. - 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 - the file LICENSE for additional details. + 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 + 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., 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" @@ -175,7 +188,7 @@ static void do_all_status(UAContext *ua) 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; jhdr.name)) { + if (!acl_access_ok(ua, Client_ACL, client->name())) { continue; } for (j=0; j 0) { - char b1[35], b2[35], b3[35], b4[35]; - bsendmsg(ua, _(" Heap: bytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"), + 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 */ @@ -277,13 +289,13 @@ static void do_storage_status(UAContext *ua, STORE *store) { 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; @@ -318,10 +330,10 @@ static void do_client_status(UAContext *ua, CLIENT *client) /* 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; @@ -378,6 +390,7 @@ static void prt_runtime(UAContext *ua, sched_pkt *sp) if (ok) { 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) { @@ -396,12 +409,11 @@ static void prt_runtime(UAContext *ua, sched_pkt *sp) } 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); } jcr->db = ua->db; /* restore ua db to jcr */ - } /* @@ -456,7 +468,7 @@ static void list_scheduled_jobs(UAContext *ua) /* Loop through all jobs */ LockRes(); foreach_res(job, R_JOB) { - if (!acl_access_ok(ua, Job_ACL, job->hdr.name) || !job->enabled) { + if (!acl_access_ok(ua, Job_ACL, job->name()) || !job->enabled) { continue; } for (run=NULL; (run = find_next_run(run, job, runtime, days)); ) { @@ -536,7 +548,7 @@ 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)) { + if (jcr->JobId == 0 || !acl_access_ok(ua, Job_ACL, jcr->job->name())) { continue; } njobs++; @@ -570,13 +582,17 @@ static void list_running_jobs(UAContext *ua) 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; @@ -630,7 +646,7 @@ static void list_running_jobs(UAContext *ua) 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; } @@ -673,8 +689,8 @@ 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; @@ -724,11 +740,11 @@ static void list_terminated_jobs(UAContext *ua) termstat = _("Other"); break; } - bsendmsg(ua, _("%6d %-6s %8s %14s %-7s %-8s %s\n"), + bsendmsg(ua, _("%6d %-6s %8s %10s %-7s %-8s %s\n"), je->JobId, level, edit_uint64_with_commas(je->JobFiles, b1), - edit_uint64_with_commas(je->JobBytes, b2), + edit_uint64_with_suffix(je->JobBytes, b2), termstat, dt, JobName); }