+/*
+ Bacula® - The Network Backup Solution
+
+ Copyright (C) 2000-2012 Free Software Foundation Europe e.V.
+
+ 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 three of the GNU Affero General Public
+ License as published by the Free Software Foundation and included
+ 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 Affero 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 of Kern Sibbald.
+ The licensor of Bacula is the Free Software Foundation Europe
+ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+ Switzerland, email:ftf@fsfeurope.org.
+*/
/*
*
* Bacula Director -- User Agent Output Commands
* Version $Id$
*/
-/*
- Copyright (C) 2000-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
- version 2 as amended with additional clauses defined in the
- file LICENSE in the main source directory.
-
- 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.
-
- */
-
#include "bacula.h"
#include "dird.h"
/* Imported subroutines */
/* Imported variables */
-extern int r_first;
-extern int r_last;
-extern RES_TABLE resources[];
-extern RES **res_head;
-extern int console_msg_pending;
-extern FILE *con_fd;
-extern brwlock_t con_lock;
/* Imported functions */
int autodisplay_cmd(UAContext *ua, const char *cmd)
{
static const char *kw[] = {
- N_("on"),
- N_("off"),
+ NT_("on"),
+ NT_("off"),
NULL};
switch (find_arg_keyword(ua, kw)) {
ua->auto_display_messages = false;
break;
default:
- bsendmsg(ua, _("ON or OFF keyword missing.\n"));
+ ua->error_msg(_("ON or OFF keyword missing.\n"));
break;
}
return 1;
int gui_cmd(UAContext *ua, const char *cmd)
{
static const char *kw[] = {
- N_("on"),
- N_("off"),
+ NT_("on"),
+ NT_("off"),
NULL};
switch (find_arg_keyword(ua, kw)) {
ua->jcr->gui = ua->gui = false;
break;
default:
- bsendmsg(ua, _("ON or OFF keyword missing.\n"));
+ ua->error_msg(_("ON or OFF keyword missing.\n"));
break;
}
return 1;
}
-
+/*
+ * Enter with Resources locked
+ */
+static void show_disabled_jobs(UAContext *ua)
+{
+ JOB *job;
+ bool first = true;
+ foreach_res(job, R_JOB) {
+ if (!acl_access_ok(ua, Job_ACL, job->name())) {
+ continue;
+ }
+ if (!job->enabled) {
+ if (first) {
+ first = false;
+ ua->send_msg(_("Disabled Jobs:\n"));
+ }
+ ua->send_msg(" %s\n", job->name());
+ }
+ }
+ if (first) {
+ ua->send_msg(_("No disabled Jobs.\n"));
+ }
+}
struct showstruct {const char *res_name; int type;};
static struct showstruct reses[] = {
- {N_("directors"), R_DIRECTOR},
- {N_("clients"), R_CLIENT},
- {N_("counters"), R_COUNTER},
- {N_("devices"), R_DEVICE},
- {N_("jobs"), R_JOB},
- {N_("storages"), R_STORAGE},
- {N_("catalogs"), R_CATALOG},
- {N_("schedules"), R_SCHEDULE},
- {N_("filesets"), R_FILESET},
- {N_("pools"), R_POOL},
- {N_("messages"), R_MSGS},
- {N_("all"), -1},
- {N_("help"), -2},
+ {NT_("directors"), R_DIRECTOR},
+ {NT_("clients"), R_CLIENT},
+ {NT_("counters"), R_COUNTER},
+ {NT_("devices"), R_DEVICE},
+ {NT_("jobs"), R_JOB},
+ {NT_("storages"), R_STORAGE},
+ {NT_("catalogs"), R_CATALOG},
+ {NT_("schedules"), R_SCHEDULE},
+ {NT_("filesets"), R_FILESET},
+ {NT_("pools"), R_POOL},
+ {NT_("messages"), R_MSGS},
+ {NT_("all"), -1},
+ {NT_("help"), -2},
{NULL, 0}
};
* show all
* show <resource-keyword-name> e.g. show directors
* show <resource-keyword-name>=<name> e.g. show director=HeadMan
+ * show disabled shows disabled jobs
*
*/
int show_cmd(UAContext *ua, const char *cmd)
LockRes();
for (i=1; i<ua->argc; i++) {
+ if (strcasecmp(ua->argk[i], _("disabled")) == 0) {
+ show_disabled_jobs(ua);
+ goto bail_out;
+ }
type = 0;
res_name = ua->argk[i];
if (!ua->argv[i]) { /* was a name given? */
}
break;
case -2:
- bsendmsg(ua, _("Keywords for the show command are:\n"));
+ ua->send_msg(_("Keywords for the show command are:\n"));
for (j=0; reses[j].res_name; j++) {
- bsendmsg(ua, "%s\n", _(reses[j].res_name));
+ ua->error_msg("%s\n", _(reses[j].res_name));
}
goto bail_out;
case -3:
- bsendmsg(ua, _("%s resource %s not found.\n"), res_name, ua->argv[i]);
+ ua->error_msg(_("%s resource %s not found.\n"), res_name, ua->argv[i]);
goto bail_out;
case 0:
- bsendmsg(ua, _("Resource %s not found\n"), res_name);
+ ua->error_msg(_("Resource %s not found\n"), res_name);
goto bail_out;
default:
dump_resource(recurse?type:-type, res, bsendmsg, ua);
*
* list jobs - lists all jobs run
* list jobid=nnn - list job data for jobid
- * list jobuid=uname - list job data for unique jobid
+ * list ujobid=uname - list job data for unique jobid
* list job=name - list all jobs with "name"
* list jobname=name - same as above
* list jobmedia jobid=<nn>
* list jobmedia job=name
+ * list joblog jobid=<nn>
+ * list joblog job=name
* list files jobid=<nn> - list files saved for job nn
* list files job=name
* list pools - list pool records
* list clients - list clients
* list nextvol job=xx - list the next vol to be used by job
* list nextvolume job=xx - same as above.
+ * list copies jobid=x,y,z
*
*/
POOL_DBR pr;
MEDIA_DBR mr;
- if (!open_db(ua))
+ if (!open_client_db(ua))
return 1;
memset(&jr, 0, sizeof(jr));
memset(&pr, 0, sizeof(pr));
- memset(&mr, 0, sizeof(mr));
Dmsg1(20, "list: %s\n", cmd);
if (!ua->db) {
- bsendmsg(ua, _("Hey! DB is NULL\n"));
+ ua->error_msg(_("Hey! DB is NULL\n"));
+ }
+
+ /* Apply any limit */
+ j = find_arg_with_value(ua, NT_("limit"));
+ if (j >= 0) {
+ jr.limit = atoi(ua->argv[j]);
}
/* Scan arguments looking for things to do */
for (i=1; i<ua->argc; i++) {
/* List JOBS */
- if (strcasecmp(ua->argk[i], N_("jobs")) == 0) {
- /* Apply any limit */
- j = find_arg_with_value(ua, N_("limit"));
- if (j >= 0) {
- jr.limit = atoi(ua->argv[j]);
- }
+ if (strcasecmp(ua->argk[i], NT_("jobs")) == 0) {
db_list_job_records(ua->jcr, ua->db, &jr, prtit, ua, llist);
/* List JOBTOTALS */
- } else if (strcasecmp(ua->argk[i], N_("jobtotals")) == 0) {
+ } else if (strcasecmp(ua->argk[i], NT_("jobtotals")) == 0) {
db_list_job_totals(ua->jcr, ua->db, &jr, prtit, ua);
/* List JOBID=nn */
- } else if (strcasecmp(ua->argk[i], N_("jobid")) == 0) {
+ } else if (strcasecmp(ua->argk[i], NT_("jobid")) == 0) {
if (ua->argv[i]) {
jobid = str_to_int64(ua->argv[i]);
if (jobid > 0) {
}
/* List JOB=xxx */
- } else if ((strcasecmp(ua->argk[i], N_("job")) == 0 ||
- strcasecmp(ua->argk[i], N_("jobname")) == 0) && ua->argv[i]) {
+ } else if ((strcasecmp(ua->argk[i], NT_("job")) == 0 ||
+ strcasecmp(ua->argk[i], NT_("jobname")) == 0) && ua->argv[i]) {
bstrncpy(jr.Name, ua->argv[i], MAX_NAME_LENGTH);
jr.JobId = 0;
db_list_job_records(ua->jcr, ua->db, &jr, prtit, ua, llist);
- /* List JOBUID=xxx */
- } else if (strcasecmp(ua->argk[i], N_("jobuid")) == 0 && ua->argv[i]) {
+ /* List UJOBID=xxx */
+ } else if (strcasecmp(ua->argk[i], NT_("ujobid")) == 0 && ua->argv[i]) {
bstrncpy(jr.Job, ua->argv[i], MAX_NAME_LENGTH);
jr.JobId = 0;
db_list_job_records(ua->jcr, ua->db, &jr, prtit, ua, llist);
+ /* List Base files */
+ } else if (strcasecmp(ua->argk[i], NT_("basefiles")) == 0) {
+ /* TODO: cleanup this block */
+ for (j=i+1; j<ua->argc; j++) {
+ if (strcasecmp(ua->argk[j], NT_("ujobid")) == 0 && ua->argv[j]) {
+ bstrncpy(jr.Job, ua->argv[j], MAX_NAME_LENGTH);
+ jr.JobId = 0;
+ db_get_job_record(ua->jcr, ua->db, &jr);
+ jobid = jr.JobId;
+ } else if (strcasecmp(ua->argk[j], NT_("jobid")) == 0 && ua->argv[j]) {
+ jobid = str_to_int64(ua->argv[j]);
+ } else {
+ continue;
+ }
+ if (jobid > 0) {
+ db_list_base_files_for_job(ua->jcr, ua->db, jobid, prtit, ua);
+ }
+ }
+
/* List FILES */
- } else if (strcasecmp(ua->argk[i], N_("files")) == 0) {
+ } else if (strcasecmp(ua->argk[i], NT_("files")) == 0) {
for (j=i+1; j<ua->argc; j++) {
- if (strcasecmp(ua->argk[j], N_("jobuid")) == 0 && ua->argv[j]) {
+ if (strcasecmp(ua->argk[j], NT_("ujobid")) == 0 && ua->argv[j]) {
bstrncpy(jr.Job, ua->argv[j], MAX_NAME_LENGTH);
jr.JobId = 0;
db_get_job_record(ua->jcr, ua->db, &jr);
jobid = jr.JobId;
- } else if (strcasecmp(ua->argk[j], N_("jobid")) == 0 && ua->argv[j]) {
+ } else if (strcasecmp(ua->argk[j], NT_("jobid")) == 0 && ua->argv[j]) {
jobid = str_to_int64(ua->argv[j]);
} else {
continue;
}
/* List JOBMEDIA */
- } else if (strcasecmp(ua->argk[i], N_("jobmedia")) == 0) {
- int done = FALSE;
+ } else if (strcasecmp(ua->argk[i], NT_("jobmedia")) == 0) {
+ bool done = false;
for (j=i+1; j<ua->argc; j++) {
- if (strcasecmp(ua->argk[j], N_("jobuid")) == 0 && ua->argv[j]) {
+ if (strcasecmp(ua->argk[j], NT_("ujobid")) == 0 && ua->argv[j]) {
bstrncpy(jr.Job, ua->argv[j], MAX_NAME_LENGTH);
jr.JobId = 0;
db_get_job_record(ua->jcr, ua->db, &jr);
jobid = jr.JobId;
- } else if (strcasecmp(ua->argk[j], N_("jobid")) == 0 && ua->argv[j]) {
+ } else if (strcasecmp(ua->argk[j], NT_("jobid")) == 0 && ua->argv[j]) {
jobid = str_to_int64(ua->argv[j]);
} else {
continue;
}
db_list_jobmedia_records(ua->jcr, ua->db, jobid, prtit, ua, llist);
- done = TRUE;
+ done = true;
}
if (!done) {
/* List for all jobs (jobid=0) */
db_list_jobmedia_records(ua->jcr, ua->db, 0, prtit, ua, llist);
}
+ /* List JOBLOG */
+ } else if (strcasecmp(ua->argk[i], NT_("joblog")) == 0) {
+ bool done = false;
+ for (j=i+1; j<ua->argc; j++) {
+ if (strcasecmp(ua->argk[j], NT_("ujobid")) == 0 && ua->argv[j]) {
+ bstrncpy(jr.Job, ua->argv[j], MAX_NAME_LENGTH);
+ jr.JobId = 0;
+ db_get_job_record(ua->jcr, ua->db, &jr);
+ jobid = jr.JobId;
+ } else if (strcasecmp(ua->argk[j], NT_("jobid")) == 0 && ua->argv[j]) {
+ jobid = str_to_int64(ua->argv[j]);
+ } else {
+ continue;
+ }
+ db_list_joblog_records(ua->jcr, ua->db, jobid, prtit, ua, llist);
+ done = true;
+ }
+ if (!done) {
+ /* List for all jobs (jobid=0) */
+ db_list_joblog_records(ua->jcr, ua->db, 0, prtit, ua, llist);
+ }
+
+
/* List POOLS */
- } else if (strcasecmp(ua->argk[i], N_("pool")) == 0 ||
- strcasecmp(ua->argk[i], N_("pools")) == 0) {
+ } else if (strcasecmp(ua->argk[i], NT_("pool")) == 0 ||
+ strcasecmp(ua->argk[i], NT_("pools")) == 0) {
POOL_DBR pr;
memset(&pr, 0, sizeof(pr));
if (ua->argv[i]) {
}
db_list_pool_records(ua->jcr, ua->db, &pr, prtit, ua, llist);
- } else if (strcasecmp(ua->argk[i], N_("clients")) == 0) {
+ } else if (strcasecmp(ua->argk[i], NT_("clients")) == 0) {
db_list_client_records(ua->jcr, ua->db, prtit, ua, llist);
/* List MEDIA or VOLUMES */
- } else if (strcasecmp(ua->argk[i], N_("media")) == 0 ||
- strcasecmp(ua->argk[i], N_("volume")) == 0 ||
- strcasecmp(ua->argk[i], N_("volumes")) == 0) {
+ } else if (strcasecmp(ua->argk[i], NT_("media")) == 0 ||
+ strcasecmp(ua->argk[i], NT_("volume")) == 0 ||
+ strcasecmp(ua->argk[i], NT_("volumes")) == 0) {
bool done = false;
for (j=i+1; j<ua->argc; j++) {
- if (strcasecmp(ua->argk[j], N_("jobuid")) == 0 && ua->argv[j]) {
+ if (strcasecmp(ua->argk[j], NT_("ujobid")) == 0 && ua->argv[j]) {
bstrncpy(jr.Job, ua->argv[j], MAX_NAME_LENGTH);
jr.JobId = 0;
db_get_job_record(ua->jcr, ua->db, &jr);
jobid = jr.JobId;
- } else if (strcasecmp(ua->argk[j], N_("jobid")) == 0 && ua->argv[j]) {
+ } else if (strcasecmp(ua->argk[j], NT_("jobid")) == 0 && ua->argv[j]) {
jobid = str_to_int64(ua->argv[j]);
} else {
continue;
}
VolumeName = get_pool_memory(PM_FNAME);
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);
+ ua->send_msg(_("Jobid %d used %d Volume(s): %s\n"), jobid, n, VolumeName);
free_pool_memory(VolumeName);
done = true;
}
}
/* Is a specific pool wanted? */
for (i=1; i<ua->argc; i++) {
- if (strcasecmp(ua->argk[i], N_("pool")) == 0) {
+ if (strcasecmp(ua->argk[i], NT_("pool")) == 0) {
if (!get_pool_dbr(ua, &pr)) {
- bsendmsg(ua, _("No Pool specified.\n"));
+ ua->error_msg(_("No Pool specified.\n"));
return 1;
}
mr.PoolId = pr.PoolId;
/* List Volumes in all pools */
if (!db_get_pool_ids(ua->jcr, ua->db, &num_pools, &ids)) {
- bsendmsg(ua, _("Error obtaining pool ids. ERR=%s\n"),
+ ua->error_msg(_("Error obtaining pool ids. ERR=%s\n"),
db_strerror(ua->db));
return 1;
}
for (i=0; i < num_pools; i++) {
pr.PoolId = ids[i];
if (db_get_pool_record(ua->jcr, ua->db, &pr)) {
- bsendmsg(ua, _("Pool: %s\n"), pr.Name);
+ ua->send_msg(_("Pool: %s\n"), pr.Name);
}
mr.PoolId = ids[i];
db_list_media_records(ua->jcr, ua->db, &mr, prtit, ua, llist);
return 1;
}
/* List next volume */
- } else if (strcasecmp(ua->argk[i], N_("nextvol")) == 0 ||
- strcasecmp(ua->argk[i], N_("nextvolume")) == 0) {
+ } else if (strcasecmp(ua->argk[i], NT_("nextvol")) == 0 ||
+ strcasecmp(ua->argk[i], NT_("nextvolume")) == 0) {
n = 1;
- j = find_arg_with_value(ua, N_("days"));
+ j = find_arg_with_value(ua, NT_("days"));
if (j >= 0) {
n = atoi(ua->argv[j]);
if ((n < 0) || (n > 50)) {
- bsendmsg(ua, _("Ignoring illegal value for days.\n"));
+ ua->warning_msg(_("Ignoring invalid value for days. Max is 50.\n"));
n = 1;
}
}
list_nextvol(ua, n);
- } else if (strcasecmp(ua->argk[i], N_("limit")) == 0
- || strcasecmp(ua->argk[i], N_("days")) == 0) {
+ } else if (strcasecmp(ua->argk[i], NT_("copies")) == 0) {
+ char *jobids = NULL;
+ uint32_t limit=0;
+ for (j=i+1; j<ua->argc; j++) {
+ if (strcasecmp(ua->argk[j], NT_("jobid")) == 0 && ua->argv[j]) {
+ if (is_a_number_list(ua->argv[j])) {
+ jobids = ua->argv[j];
+ }
+ } else if (strcasecmp(ua->argk[j], NT_("limit")) == 0 && ua->argv[j]) {
+ limit = atoi(ua->argv[j]);
+ }
+ }
+ db_list_copies_records(ua->jcr,ua->db,limit,jobids,prtit,ua,llist);
+ } else if (strcasecmp(ua->argk[i], NT_("limit")) == 0
+ || strcasecmp(ua->argk[i], NT_("days")) == 0) {
/* Ignore it */
} else {
- bsendmsg(ua, _("Unknown list keyword: %s\n"), NPRT(ua->argk[i]));
+ ua->error_msg(_("Unknown list keyword: %s\n"), NPRT(ua->argk[i]));
}
}
return 1;
static bool list_nextvol(UAContext *ua, int ndays)
{
JOB *job;
- JCR *jcr = ua->jcr;
- POOL *pool;
+ JCR *jcr;
+ USTORE store;
RUN *run;
- time_t runtime;
+ utime_t runtime;
bool found = false;
MEDIA_DBR mr;
POOL_DBR pr;
- memset(&mr, 0, sizeof(mr));
int i = find_arg_with_value(ua, "job");
if (i <= 0) {
if ((job = select_job_resource(ua)) == NULL) {
} else {
job = (JOB *)GetResWithName(R_JOB, ua->argv[i]);
if (!job) {
- Jmsg(jcr, M_ERROR, 0, _("%s is not a job name.\n"), ua->argv[i]);
+ Jmsg(ua->jcr, M_ERROR, 0, _("%s is not a job name.\n"), ua->argv[i]);
if ((job = select_job_resource(ua)) == NULL) {
return false;
}
}
}
+
+ jcr = new_jcr(sizeof(JCR), dird_free_jcr);
for (run=NULL; (run = find_next_run(run, job, runtime, ndays)); ) {
- pool = run->pool ? run->pool : NULL;
- if (!complete_jcr_for_job(jcr, job, pool)) {
- return false;
+ if (!complete_jcr_for_job(jcr, job, run->pool)) {
+ found = false;
+ goto get_out;
}
- mr.PoolId = jcr->jr.PoolId;
- if (run->storage) {
- jcr->store = run->storage;
+ if (!jcr->jr.PoolId) {
+ ua->error_msg(_("Could not find Pool for Job %s\n"), job->name());
+ continue;
}
memset(&pr, 0, sizeof(pr));
pr.PoolId = jcr->jr.PoolId;
- if (! db_get_pool_record(ua->jcr, ua->db, &pr)) {
- strcpy(pr.Name, "*UnknownPool*");
+ if (!db_get_pool_record(jcr, jcr->db, &pr)) {
+ bstrncpy(pr.Name, "*UnknownPool*", sizeof(pr.Name));
}
- if (!find_next_volume_for_append(jcr, &mr, 1, false/*no create*/)) {
- bsendmsg(ua, _("Could not find next Volume for Job %s (%s, %s).\n"),
- job->hdr.name, pr.Name, level_to_str(run->level));
+ mr.PoolId = jcr->jr.PoolId;
+ get_job_storage(&store, job, run);
+ set_storageid_in_mr(store.store, &mr);
+ /* no need to set ScratchPoolId, since we use fnv_no_create_vol */
+ if (!find_next_volume_for_append(jcr, &mr, 1, fnv_no_create_vol, fnv_prune)) {
+ ua->error_msg(_("Could not find next Volume for Job %s (Pool=%s, Level=%s).\n"),
+ job->name(), pr.Name, level_to_str(run->level));
} else {
- bsendmsg(ua,
- _("The next Volume to be used by Job \"%s\" (%s, %s) will be %s\n"),
- job->hdr.name, pr.Name, level_to_str(run->level), mr.VolumeName);
+ ua->send_msg(
+ _("The next Volume to be used by Job \"%s\" (Pool=%s, Level=%s) will be %s\n"),
+ job->name(), pr.Name, level_to_str(run->level), mr.VolumeName);
found = true;
}
- if (jcr->db && jcr->db != ua->db) {
- db_close_database(jcr, jcr->db);
- jcr->db = NULL;
- }
}
+
+get_out:
+ if (jcr->db) {
+ db_close_database(jcr, jcr->db);
+ jcr->db = NULL;
+ }
+ free_jcr(jcr);
if (!found) {
- bsendmsg(ua, _("Could not find next Volume for Job %s.\n"),
+ ua->error_msg(_("Could not find next Volume for Job %s.\n"),
job->hdr.name);
return false;
}
* For a given job, we examine all his run records
* to see if it is scheduled today or tomorrow.
*/
-RUN *find_next_run(RUN *run, JOB *job, time_t &runtime, int ndays)
+RUN *find_next_run(RUN *run, JOB *job, utime_t &runtime, int ndays)
{
time_t now, future, endtime;
SCHED *sched;
future = now + (day * 60 * 60 * 24);
/* Break down the time into components */
- localtime_r(&future, &tm);
+ (void)localtime_r(&future, &tm);
mday = tm.tm_mday - 1;
wday = tm.tm_wday;
month = tm.tm_mon;
bit_is_set(woy, run->woy);
#ifdef xxx
- Dmsg2(000, "day=%d is_scheduled=%d\n", day, is_scheduled);
- Dmsg1(000, "bit_set_mday=%d\n", bit_is_set(mday, run->mday));
- Dmsg1(000, "bit_set_wday=%d\n", bit_is_set(wday, run->wday));
- Dmsg1(000, "bit_set_month=%d\n", bit_is_set(month, run->month));
- Dmsg1(000, "bit_set_wom=%d\n", bit_is_set(wom, run->wom));
- Dmsg1(000, "bit_set_woy=%d\n", bit_is_set(woy, run->woy));
+ Pmsg2(000, "day=%d is_scheduled=%d\n", day, is_scheduled);
+ Pmsg1(000, "bit_set_mday=%d\n", bit_is_set(mday, run->mday));
+ Pmsg1(000, "bit_set_wday=%d\n", bit_is_set(wday, run->wday));
+ Pmsg1(000, "bit_set_month=%d\n", bit_is_set(month, run->month));
+ Pmsg1(000, "bit_set_wom=%d\n", bit_is_set(wom, run->wom));
+ Pmsg1(000, "bit_set_woy=%d\n", bit_is_set(woy, run->woy));
#endif
if (is_scheduled) { /* Jobs scheduled on that day */
}
}
bstrncat(buf, "\n", sizeof(buf));
- Dmsg1(000, "%s", buf);
+ Pmsg1(000, "%s", buf);
#endif
/* find time (time_t) job is to be run */
- localtime_r(&future, &runtm);
+ (void)localtime_r(&future, &runtm);
for (i= 0; i < 24; i++) {
if (bit_is_set(i, run->hour)) {
runtm.tm_hour = i;
runtm.tm_min = run->minute;
runtm.tm_sec = 0;
runtime = mktime(&runtm);
- Dmsg2(200, "now=%d runtime=%d\n", now, runtime);
+ Dmsg2(200, "now=%d runtime=%lld\n", now, runtime);
if ((runtime > now) && (runtime < endtime)) {
Dmsg2(200, "Found it level=%d %c\n", run->level, run->level);
return run; /* found it, return run resource */
/* Nothing found */
return NULL;
}
+
/*
* Fill in the remaining fields of the jcr as if it
* is going to run the job.
*/
-int complete_jcr_for_job(JCR *jcr, JOB *job, POOL *pool)
+bool complete_jcr_for_job(JCR *jcr, JOB *job, POOL *pool)
{
POOL_DBR pr;
if (pool) {
jcr->pool = pool; /* override */
}
- jcr->db = jcr->db=db_init_database(jcr, jcr->catalog->db_name, jcr->catalog->db_user,
- jcr->catalog->db_password, jcr->catalog->db_address,
- jcr->catalog->db_port, jcr->catalog->db_socket,
- jcr->catalog->mult_db_connections);
+ if (jcr->db) {
+ Dmsg0(100, "complete_jcr close db\n");
+ db_close_database(jcr, jcr->db);
+ jcr->db = NULL;
+ }
+
+ Dmsg0(100, "complete_jcr open db\n");
+ jcr->db = db_init_database(jcr, jcr->catalog->db_driver, jcr->catalog->db_name,
+ jcr->catalog->db_user,
+ jcr->catalog->db_password, jcr->catalog->db_address,
+ jcr->catalog->db_port, jcr->catalog->db_socket,
+ jcr->catalog->mult_db_connections,
+ jcr->catalog->disable_batch_insert);
if (!jcr->db || !db_open_database(jcr, jcr->db)) {
Jmsg(jcr, M_FATAL, 0, _("Could not open database \"%s\".\n"),
jcr->catalog->db_name);
if (jcr->db) {
Jmsg(jcr, M_FATAL, 0, "%s", db_strerror(jcr->db));
+ db_close_database(jcr, jcr->db);
+ jcr->db = NULL;
}
- return 0;
+ return false;
}
- bstrncpy(pr.Name, jcr->pool->hdr.name, sizeof(pr.Name));
+ bstrncpy(pr.Name, jcr->pool->name(), sizeof(pr.Name));
while (!db_get_pool_record(jcr, jcr->db, &pr)) { /* get by Name */
/* Try to create the pool */
if (create_pool(jcr, jcr->db, jcr->pool, POOL_OP_CREATE) < 0) {
db_close_database(jcr, jcr->db);
jcr->db = NULL;
}
- return 0;
+ return false;
} else {
Jmsg(jcr, M_INFO, 0, _("Pool %s created in database.\n"), pr.Name);
}
}
jcr->jr.PoolId = pr.PoolId;
- return 1;
+ return true;
}
ua->UA_sock->msg = check_pool_memory_size(ua->UA_sock->msg, mlen+1);
strcpy(ua->UA_sock->msg, msg);
ua->UA_sock->msglen = mlen;
- bnet_send(ua->UA_sock);
+ ua->UA_sock->send();
do_truncate = true;
}
if (do_truncate) {
if (console_msg_pending) {
do_messages(ua, cmd);
} else {
- bnet_fsend(ua->UA_sock, _("You have no messages.\n"));
+ ua->UA_sock->fsend(_("You have no messages.\n"));
}
return 1;
}
{
UAContext *ua = (UAContext *)ctx;
- bnet_fsend(ua->UA_sock, "%s", msg);
+ ua->UA_sock->fsend("%s", msg);
}
/*
* agent, so we are being called from Bacula core. In
* that case direct the messages to the Job.
*/
-void bsendmsg(void *ctx, const char *fmt, ...)
+#ifdef HAVE_VA_COPY
+void bmsg(UAContext *ua, const char *fmt, va_list arg_ptr)
{
- va_list arg_ptr;
- UAContext *ua = (UAContext *)ctx;
BSOCK *bs = ua->UA_sock;
int maxlen, len;
- POOLMEM *msg;
+ POOLMEM *msg = NULL;
+ va_list ap;
if (bs) {
msg = bs->msg;
- } else {
+ }
+ if (!msg) {
msg = get_pool_memory(PM_EMSG);
}
again:
maxlen = sizeof_pool_memory(msg) - 1;
- va_start(arg_ptr, fmt);
- len = bvsnprintf(msg, maxlen, fmt, arg_ptr);
- va_end(arg_ptr);
+ va_copy(ap, arg_ptr);
+ len = bvsnprintf(msg, maxlen, fmt, ap);
+ va_end(ap);
if (len < 0 || len >= maxlen) {
msg = realloc_pool_memory(msg, maxlen + maxlen/2);
goto again;
if (bs) {
bs->msg = msg;
bs->msglen = len;
- bnet_send(bs);
+ bs->send();
+ } else { /* No UA, send to Job */
+ Jmsg(ua->jcr, M_INFO, 0, "%s", msg);
+ free_pool_memory(msg);
+ }
+
+}
+
+#else /* no va_copy() -- brain damaged version of variable arguments */
+
+void bmsg(UAContext *ua, const char *fmt, va_list arg_ptr)
+{
+ BSOCK *bs = ua->UA_sock;
+ int maxlen, len;
+ POOLMEM *msg = NULL;
+
+ if (bs) {
+ msg = bs->msg;
+ }
+ if (!msg) {
+ msg = get_memory(5000);
+ }
+
+ maxlen = sizeof_pool_memory(msg) - 1;
+ if (maxlen < 4999) {
+ msg = realloc_pool_memory(msg, 5000);
+ maxlen = 4999;
+ }
+ len = bvsnprintf(msg, maxlen, fmt, arg_ptr);
+ if (len < 0 || len >= maxlen) {
+ pm_strcpy(msg, _("Message too long to display.\n"));
+ len = strlen(msg);
+ }
+
+ if (bs) {
+ bs->msg = msg;
+ bs->msglen = len;
+ bs->send();
} else { /* No UA, send to Job */
Jmsg(ua->jcr, M_INFO, 0, "%s", msg);
free_pool_memory(msg);
}
}
+#endif
+
+void bsendmsg(void *ctx, const char *fmt, ...)
+{
+ va_list arg_ptr;
+ va_start(arg_ptr, fmt);
+ bmsg((UAContext *)ctx, fmt, arg_ptr);
+ va_end(arg_ptr);
+}
+
+/*
+ * The following UA methods are mainly intended for GUI
+ * programs
+ */
+/*
+ * This is a message that should be displayed on the user's
+ * console.
+ */
+void UAContext::send_msg(const char *fmt, ...)
+{
+ va_list arg_ptr;
+ va_start(arg_ptr, fmt);
+ bmsg(this, fmt, arg_ptr);
+ va_end(arg_ptr);
+}
+
+
+/*
+ * This is an error condition with a command. The gui should put
+ * up an error or critical dialog box. The command is aborted.
+ */
+void UAContext::error_msg(const char *fmt, ...)
+{
+ BSOCK *bs = UA_sock;
+ va_list arg_ptr;
+
+ if (bs && api) bs->signal(BNET_ERROR_MSG);
+ va_start(arg_ptr, fmt);
+ bmsg(this, fmt, arg_ptr);
+ va_end(arg_ptr);
+}
+
+/*
+ * This is a warning message, that should bring up a warning
+ * dialog box on the GUI. The command is not aborted, but something
+ * went wrong.
+ */
+void UAContext::warning_msg(const char *fmt, ...)
+{
+ BSOCK *bs = UA_sock;
+ va_list arg_ptr;
+
+ if (bs && api) bs->signal(BNET_WARNING_MSG);
+ va_start(arg_ptr, fmt);
+ bmsg(this, fmt, arg_ptr);
+ va_end(arg_ptr);
+}
+
+/*
+ * This is an information message that should probably be put
+ * into the status line of a GUI program.
+ */
+void UAContext::info_msg(const char *fmt, ...)
+{
+ BSOCK *bs = UA_sock;
+ va_list arg_ptr;
+
+ if (bs && api) bs->signal(BNET_INFO_MSG);
+ va_start(arg_ptr, fmt);
+ bmsg(this, fmt, arg_ptr);
+ va_end(arg_ptr);
+}
projects / bacula / bacula / blobdiff