*/
/*
- Copyright (C) 2000-2004 Kern Sibbald and John Walker
+ Copyright (C) 2000-2005 Kern Sibbald
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.
+ 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 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.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ the file LICENSE for additional details.
*/
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 */
/* Forward referenced functions */
static int do_list_cmd(UAContext *ua, const char *cmd, e_list_type llist);
+static bool list_nextvol(UAContext *ua);
/*
* Turn auto display of console messages on/off
int autodisplay_cmd(UAContext *ua, const char *cmd)
{
static const char *kw[] = {
- N_("on"),
+ N_("on"),
N_("off"),
NULL};
bsendmsg(ua, _("ON or OFF keyword missing.\n"));
break;
}
- return 1;
+ return 1;
}
/*
- * Turn gui processing on/off
+ * Turn batch processing on/off
*/
int gui_cmd(UAContext *ua, const char *cmd)
{
static const char *kw[] = {
- N_("on"),
+ N_("on"),
N_("off"),
NULL};
switch (find_arg_keyword(ua, kw)) {
case 0:
+ ua->batch = true;
ua->jcr->gui = true;
break;
case 1:
+ ua->batch = false;
ua->jcr->gui = false;
break;
default:
bsendmsg(ua, _("ON or OFF keyword missing.\n"));
break;
}
- return 1;
+ return 1;
}
{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},
*/
int show_cmd(UAContext *ua, const char *cmd)
{
- int i, j, type, len;
+ int i, j, type, len;
int recurse;
char *res_name;
RES *res = NULL;
LockRes();
for (i=1; i<ua->argc; i++) {
type = 0;
- res_name = ua->argk[i];
+ res_name = ua->argk[i];
if (!ua->argv[i]) { /* was a name given? */
/* No name, dump all resources of specified type */
recurse = 1;
if (strncasecmp(res_name, _(reses[j].res_name), len) == 0) {
type = reses[j].type;
if (type > 0) {
- res = resources[type-r_first].res_head;
+ res = res_head[type-r_first];
} else {
res = NULL;
}
switch (type) {
case -1: /* all */
for (j=r_first; j<=r_last; j++) {
- dump_resource(j, resources[j-r_first].res_head, bsendmsg, ua);
+ dump_resource(j, res_head[j-r_first], bsendmsg, ua);
}
break;
case -2:
for (i=1; i<ua->argc; i++) {
/* List JOBS */
if (strcasecmp(ua->argk[i], _("jobs")) == 0) {
+ /* Apply any limit */
+ j = find_arg_with_value(ua, _("limit"));
+ if (j >= 0) {
+ jr.limit = atoi(ua->argv[j]);
+ }
db_list_job_records(ua->jcr, ua->db, &jr, prtit, ua, llist);
/* List JOBTOTALS */
/* List JOBID */
} else if (strcasecmp(ua->argk[i], _("jobid")) == 0) {
if (ua->argv[i]) {
- jobid = atoi(ua->argv[i]);
+ jobid = str_to_int64(ua->argv[i]);
if (jobid > 0) {
jr.JobId = jobid;
db_list_job_records(ua->jcr, ua->db, &jr, prtit, ua, llist);
db_get_job_record(ua->jcr, ua->db, &jr);
jobid = jr.JobId;
} else if (strcasecmp(ua->argk[j], _("jobid")) == 0 && ua->argv[j]) {
- jobid = atoi(ua->argv[j]);
+ jobid = str_to_int64(ua->argv[j]);
} else {
continue;
}
db_list_files_for_job(ua->jcr, ua->db, jobid, prtit, ua);
}
}
-
+
/* List JOBMEDIA */
} else if (strcasecmp(ua->argk[i], _("jobmedia")) == 0) {
int done = FALSE;
db_get_job_record(ua->jcr, ua->db, &jr);
jobid = jr.JobId;
} else if (strcasecmp(ua->argk[j], _("jobid")) == 0 && ua->argv[j]) {
- jobid = atoi(ua->argv[j]);
+ jobid = str_to_int64(ua->argv[j]);
} else {
continue;
}
db_get_job_record(ua->jcr, ua->db, &jr);
jobid = jr.JobId;
} else if (strcasecmp(ua->argk[j], _("jobid")) == 0 && ua->argv[j]) {
- jobid = atoi(ua->argv[j]);
+ jobid = str_to_int64(ua->argv[j]);
} else {
continue;
}
}
/* 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"),
+ bsendmsg(ua, _("Error obtaining pool ids. ERR=%s\n"),
db_strerror(ua->db));
return 1;
}
db_list_media_records(ua->jcr, ua->db, &mr, prtit, ua, llist);
return 1;
/* List next volume */
- } else if (strcasecmp(ua->argk[i], _("nextvol")) == 0 ||
+ } else if (strcasecmp(ua->argk[i], _("nextvol")) == 0 ||
strcasecmp(ua->argk[i], _("nextvolume")) == 0) {
- JOB *job;
- JCR *jcr = ua->jcr;
- POOL *pool;
- RUN *run;
- time_t runtime;
- bool found = false;
-
- i = find_arg_with_value(ua, "job");
- if (i <= 0) {
- if ((job = select_job_resource(ua)) == NULL) {
- return 1;
- }
- } 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]);
- if ((job = select_job_resource(ua)) == NULL) {
- return 1;
- }
- }
- }
- for (run=NULL; (run = find_next_run(run, job, runtime)); ) {
- pool = run ? run->pool : NULL;
- if (!complete_jcr_for_job(jcr, job, pool)) {
- return 1;
- }
-
- if (!find_next_volume_for_append(jcr, &mr, 0)) {
- bsendmsg(ua, _("Could not find next Volume.\n"));
- if (jcr->db) {
- db_close_database(jcr, jcr->db);
- jcr->db = NULL;
- }
- return 1;
- } else {
- bsendmsg(ua, _("The next Volume to be used by Job \"%s\" will be %s\n"),
- job->hdr.name, mr.VolumeName);
- found = true;
- }
- if (jcr->db) {
- db_close_database(jcr, jcr->db);
- jcr->db = NULL;
- }
- }
- if (jcr->db) {
- db_close_database(jcr, jcr->db);
- jcr->db = NULL;
- }
- if (!found) {
- bsendmsg(ua, _("Could not find next Volume.\n"));
- }
- return 1;
+ list_nextvol(ua);
+ } else if (strcasecmp(ua->argk[i], _("limit")) == 0) {
+ /* Ignore it */
} else {
bsendmsg(ua, _("Unknown list keyword: %s\n"), NPRT(ua->argk[i]));
}
return 1;
}
-/*
+static bool list_nextvol(UAContext *ua)
+{
+ JOB *job;
+ JCR *jcr = ua->jcr;
+ POOL *pool;
+ RUN *run;
+ time_t runtime;
+ bool found = false;
+ MEDIA_DBR mr;
+
+ memset(&mr, 0, sizeof(mr));
+ int i = find_arg_with_value(ua, "job");
+ if (i <= 0) {
+ if ((job = select_job_resource(ua)) == NULL) {
+ return false;
+ }
+ } 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]);
+ if ((job = select_job_resource(ua)) == NULL) {
+ return false;
+ }
+ }
+ }
+ for (run=NULL; (run = find_next_run(run, job, runtime)); ) {
+ pool = run->pool ? run->pool : NULL;
+ if (!complete_jcr_for_job(jcr, job, pool)) {
+ return false;
+ }
+ mr.PoolId = jcr->PoolId;
+ if (run->storage) {
+ jcr->store = run->storage;
+ }
+ if (!find_next_volume_for_append(jcr, &mr, 0)) {
+ bsendmsg(ua, _("Could not find next Volume.\n"));
+ } else {
+ bsendmsg(ua, _("The next Volume to be used by Job \"%s\" will be %s\n"),
+ job->hdr.name, mr.VolumeName);
+ found = true;
+ }
+ if (jcr->db && jcr->db != ua->db) {
+ db_close_database(jcr, jcr->db);
+ jcr->db = NULL;
+ }
+ }
+ if (!found) {
+ bsendmsg(ua, _("Could not find next Volume.\n"));
+ return false;
+ }
+ return true;
+}
+
+
+/*
* For a given job, we examine all his run records
* to see if it is scheduled today or tomorrow.
*/
if (sched == NULL) { /* scheduled? */
return NULL; /* no nothing to report */
}
- /* Break down current time into components */
+ /* Break down current time into components */
now = time(NULL);
localtime_r(&now, &tm);
mday = tm.tm_mday - 1;
run = run->next;
}
for ( ; run; run=run->next) {
- /*
+ /*
* Find runs in next 24 hours
*/
- tod = bit_is_set(mday, run->mday) && bit_is_set(wday, run->wday) &&
+ tod = bit_is_set(mday, run->mday) && bit_is_set(wday, run->wday) &&
bit_is_set(month, run->month) && bit_is_set(wom, run->wom) &&
bit_is_set(woy, run->woy);
}
bstrncat(buf, "\n", sizeof(buf));
Dmsg1(000, "%s", buf);
-#endif
+#endif
/* find time (time_t) job is to be run */
localtime_r(&now, &tm);
for (i=tm.tm_hour; i < 24; i++) {
}
}
}
- } /* end for loop over runs */
+ } /* end for loop over runs */
/* Nothing found */
return NULL;
}
-/*
+/*
* Fill in the remaining fields of the jcr as if it
* is going to run the job.
*/
{
POOL_DBR pr;
- memset(&pr, 0, sizeof(POOL_DBR));
+ memset(&pr, 0, sizeof(POOL_DBR));
set_jcr_defaults(jcr, job);
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->db_port, jcr->catalog->db_socket,
+ jcr->catalog->mult_db_connections);
if (!jcr->db || !db_open_database(jcr, jcr->db)) {
Jmsg(jcr, M_FATAL, 0, _("Could not open database \"%s\".\n"),
jcr->catalog->db_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) {
- Jmsg(jcr, M_FATAL, 0, _("Pool %s not in database. %s"), pr.Name,
+ Jmsg(jcr, M_FATAL, 0, _("Pool %s not in database. %s"), pr.Name,
db_strerror(jcr->db));
if (jcr->db) {
db_close_database(jcr, jcr->db);
Jmsg(jcr, M_INFO, 0, _("Pool %s created in database.\n"), pr.Name);
}
}
- jcr->PoolId = pr.PoolId;
+ jcr->PoolId = pr.PoolId;
jcr->jr.PoolId = pr.PoolId;
return 1;
}
void do_messages(UAContext *ua, const char *cmd)
{
char msg[2000];
- int mlen;
+ int mlen;
int do_truncate = FALSE;
Pw(con_lock);
void prtit(void *ctx, const char *msg)
{
UAContext *ua = (UAContext *)ctx;
-
+
bnet_fsend(ua->UA_sock, "%s", msg);
}
-/*
- * Format message and send to other end.
+/*
+ * Format message and send to other end.
* If the UA_sock is NULL, it means that there is no user
* agent, so we are being called from Bacula core. In
projects / bacula / bacula / blobdiff