-/*
- *
- * Bacula Director -- Run Command
- *
- * Kern Sibbald, December MMI
- *
- * Version $Id$
- */
/*
Bacula® - The Network Backup Solution
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
*/
+/*
+ *
+ * Bacula Director -- Run Command
+ *
+ * Kern Sibbald, December MMI
+ *
+ * Version $Id$
+ */
#include "bacula.h"
#include "dird.h"
/* Forward referenced subroutines */
static void select_job_level(UAContext *ua, JCR *jcr);
-static bool display_job_parameters(UAContext *ua, JCR *jcr, JOB *job, char *verify_list,
- char *jid, const char *replace);
+static bool display_job_parameters(UAContext *ua, JCR *jcr, JOB *job,
+ char *verify_list, char *jid, const char *replace,
+ char *client_name);
+static void select_where_regexp(UAContext *ua, JCR *jcr);
/* Imported variables */
{
JCR *jcr;
char *job_name, *level_name, *jid, *store_name, *pool_name;
- char *where, *fileset_name, *client_name, *bootstrap;
+ char *where, *fileset_name, *client_name, *bootstrap, *regexwhere;
+ char *restore_client_name;
const char *replace;
char *when, *verify_job_name, *catalog_name;
char *previous_job_name;
"level", /* 5 */
"storage", /* 6 */
"sd", /* 7 */
- "pool", /* 8 */
+ "regexwhere", /* 8 where string as a bregexp */
"where", /* 9 */
"bootstrap", /* 10 */
"replace", /* 11 */
"cloned", /* 19 cloned */
"verifylist", /* 20 verify output list */
"migrationjob", /* 21 migration job name */
+ "pool", /* 22 */
+ "backupclient", /* 23 */
+ "restoreclient", /* 24 */
NULL};
#define YES_POS 14
store_name = NULL;
pool_name = NULL;
where = NULL;
+ regexwhere = NULL;
when = NULL;
client_name = NULL;
+ restore_client_name = NULL;
fileset_name = NULL;
bootstrap = NULL;
replace = NULL;
if (strcasecmp(ua->argk[i], kw[j]) == 0) {
/* Note, yes and run have no value, so do not fail */
if (!ua->argv[i] && j != YES_POS /*yes*/) {
- bsendmsg(ua, _("Value missing for keyword %s\n"), ua->argk[i]);
+ ua->send_msg(_("Value missing for keyword %s\n"), ua->argk[i]);
return 1;
}
Dmsg1(800, "Got keyword=%s\n", NPRT(kw[j]));
switch (j) {
case 0: /* job */
if (job_name) {
- bsendmsg(ua, _("Job name specified twice.\n"));
+ ua->send_msg(_("Job name specified twice.\n"));
return 0;
}
job_name = ua->argv[i];
break;
case 1: /* JobId */
if (jid) {
- bsendmsg(ua, _("JobId specified twice.\n"));
+ ua->send_msg(_("JobId specified twice.\n"));
return 0;
}
jid = ua->argv[i];
case 2: /* client */
case 3: /* fd */
if (client_name) {
- bsendmsg(ua, _("Client specified twice.\n"));
+ ua->send_msg(_("Client specified twice.\n"));
return 0;
}
client_name = ua->argv[i];
break;
case 4: /* fileset */
if (fileset_name) {
- bsendmsg(ua, _("FileSet specified twice.\n"));
+ ua->send_msg(_("FileSet specified twice.\n"));
return 0;
}
fileset_name = ua->argv[i];
break;
case 5: /* level */
if (level_name) {
- bsendmsg(ua, _("Level specified twice.\n"));
+ ua->send_msg(_("Level specified twice.\n"));
return 0;
}
level_name = ua->argv[i];
case 6: /* storage */
case 7: /* sd */
if (store_name) {
- bsendmsg(ua, _("Storage specified twice.\n"));
+ ua->send_msg(_("Storage specified twice.\n"));
return 0;
}
store_name = ua->argv[i];
kw_ok = true;
break;
- case 8: /* pool */
- if (pool_name) {
- bsendmsg(ua, _("Pool specified twice.\n"));
+ case 8: /* regexwhere */
+ if (regexwhere || where) {
+ ua->send_msg(_("RegexWhere or Where specified twice.\n"));
+ return 0;
+ }
+ regexwhere = ua->argv[i];
+ if (!acl_access_ok(ua, Where_ACL, regexwhere)) {
+ ua->send_msg(_("Forbidden \"regexwhere\" specified.\n"));
return 0;
}
- pool_name = ua->argv[i];
kw_ok = true;
break;
- case 9: /* where */
- if (where) {
- bsendmsg(ua, _("Where specified twice.\n"));
+ case 9: /* where */
+ if (where || regexwhere) {
+ ua->send_msg(_("Where or RegexWhere specified twice.\n"));
return 0;
}
where = ua->argv[i];
if (!acl_access_ok(ua, Where_ACL, where)) {
- bsendmsg(ua, _("Forbidden \"where\" specified.\n"));
+ ua->send_msg(_("Forbidden \"where\" specified.\n"));
return 0;
}
kw_ok = true;
break;
case 10: /* bootstrap */
if (bootstrap) {
- bsendmsg(ua, _("Bootstrap specified twice.\n"));
+ ua->send_msg(_("Bootstrap specified twice.\n"));
return 0;
}
bootstrap = ua->argv[i];
break;
case 11: /* replace */
if (replace) {
- bsendmsg(ua, _("Replace specified twice.\n"));
+ ua->send_msg(_("Replace specified twice.\n"));
return 0;
}
replace = ua->argv[i];
break;
case 12: /* When */
if (when) {
- bsendmsg(ua, _("When specified twice.\n"));
+ ua->send_msg(_("When specified twice.\n"));
return 0;
}
when = ua->argv[i];
break;
case 13: /* Priority */
if (Priority) {
- bsendmsg(ua, _("Priority specified twice.\n"));
+ ua->send_msg(_("Priority specified twice.\n"));
return 0;
}
Priority = atoi(ua->argv[i]);
if (Priority <= 0) {
- bsendmsg(ua, _("Priority must be positive nonzero setting it to 10.\n"));
+ ua->send_msg(_("Priority must be positive nonzero setting it to 10.\n"));
Priority = 10;
}
kw_ok = true;
break;
case 15: /* Verify Job */
if (verify_job_name) {
- bsendmsg(ua, _("Verify Job specified twice.\n"));
+ ua->send_msg(_("Verify Job specified twice.\n"));
return 0;
}
verify_job_name = ua->argv[i];
break;
case 21: /* Migration Job */
if (previous_job_name) {
- bsendmsg(ua, _("Migration Job specified twice.\n"));
+ ua->send_msg(_("Migration Job specified twice.\n"));
return 0;
}
previous_job_name = ua->argv[i];
kw_ok = true;
break;
-
-
+ case 22: /* pool */
+ if (pool_name) {
+ ua->send_msg(_("Pool specified twice.\n"));
+ return 0;
+ }
+ pool_name = ua->argv[i];
+ kw_ok = true;
+ break;
+ case 23: /* backupclient */
+ if (client_name) {
+ ua->send_msg(_("Client specified twice.\n"));
+ return 0;
+ }
+ client_name = ua->argv[i];
+ kw_ok = true;
+ break;
+ case 24: /* restoreclient */
+ if (restore_client_name) {
+ ua->send_msg(_("Restore Client specified twice.\n"));
+ return 0;
+ }
+ restore_client_name = ua->argv[i];
+ kw_ok = true;
+ break;
default:
break;
}
job_name = ua->argk[i]; /* use keyword as job name */
Dmsg1(800, "Set jobname=%s\n", job_name);
} else {
- bsendmsg(ua, _("Invalid keyword: %s\n"), ua->argk[i]);
+ ua->send_msg(_("Invalid keyword: %s\n"), ua->argk[i]);
return 0;
}
}
if (catalog_name != NULL) {
catalog = (CAT *)GetResWithName(R_CATALOG, catalog_name);
if (catalog == NULL) {
- bsendmsg(ua, _("Catalog \"%s\" not found\n"), catalog_name);
+ ua->error_msg(_("Catalog \"%s\" not found\n"), catalog_name);
return 0;
}
if (!acl_access_ok(ua, Catalog_ACL, catalog->name())) {
- bsendmsg(ua, _("No authorization. Catalog \"%s\".\n"), catalog->name());
+ ua->error_msg(_("No authorization. Catalog \"%s\".\n"), catalog->name());
return 0;
}
}
job = (JOB *)GetResWithName(R_JOB, job_name);
if (!job) {
if (*job_name != 0) {
- bsendmsg(ua, _("Job \"%s\" not found\n"), job_name);
+ ua->send_msg(_("Job \"%s\" not found\n"), job_name);
}
job = select_job_resource(ua);
} else {
Dmsg1(800, "Found job=%s\n", job_name);
}
} else {
- bsendmsg(ua, _("A job name must be specified.\n"));
+ ua->send_msg(_("A job name must be specified.\n"));
job = select_job_resource(ua);
}
if (!job) {
return 0;
} else if (!acl_access_ok(ua, Job_ACL, job->name())) {
- bsendmsg(ua, _("No authorization. Job \"%s\".\n"),
+ ua->error_msg( _("No authorization. Job \"%s\".\n"),
job->name());
return 0;
}
pool = (POOL *)GetResWithName(R_POOL, pool_name);
if (!pool) {
if (*pool_name != 0) {
- bsendmsg(ua, _("Pool \"%s\" not found.\n"), pool_name);
+ ua->warning_msg(_("Pool \"%s\" not found.\n"), pool_name);
}
pool = select_pool_resource(ua);
}
if (!pool) {
return 0;
} else if (!acl_access_ok(ua, Pool_ACL, pool->name())) {
- bsendmsg(ua, _("No authorization. Pool \"%s\".\n"),
+ ua->error_msg(_("No authorization. Pool \"%s\".\n"),
pool->name());
return 0;
}
pm_strcpy(store.store_source, _("command line"));
if (!store.store) {
if (*store_name != 0) {
- bsendmsg(ua, _("Storage \"%s\" not found.\n"), store_name);
+ ua->warning_msg(_("Storage \"%s\" not found.\n"), store_name);
}
store.store = select_storage_resource(ua);
pm_strcpy(store.store_source, _("user selection"));
get_job_storage(&store, job, NULL); /* use default */
}
if (!store.store) {
- bsendmsg(ua, _("No storage specified.\n"));
+ ua->error_msg(_("No storage specified.\n"));
return 1;
} else if (!acl_access_ok(ua, Storage_ACL, store.store->name())) {
- bsendmsg(ua, _("No authorization. Storage \"%s\".\n"),
+ ua->error_msg(_("No authorization. Storage \"%s\".\n"),
store.store->name());
return 0;
}
client = (CLIENT *)GetResWithName(R_CLIENT, client_name);
if (!client) {
if (*client_name != 0) {
- bsendmsg(ua, _("Client \"%s\" not found.\n"), client_name);
+ ua->warning_msg(_("Client \"%s\" not found.\n"), client_name);
}
client = select_client_resource(ua);
}
if (!client) {
return 0;
} else if (!acl_access_ok(ua, Client_ACL, client->name())) {
- bsendmsg(ua, _("No authorization. Client \"%s\".\n"),
+ ua->error_msg(_("No authorization. Client \"%s\".\n"),
client->name());
return 0;
}
Dmsg1(800, "Using client=%s\n", client->name());
+ if (restore_client_name) {
+ client = (CLIENT *)GetResWithName(R_CLIENT, restore_client_name);
+ if (!client) {
+ if (*restore_client_name != 0) {
+ ua->warning_msg(_("Restore Client \"%s\" not found.\n"), restore_client_name);
+ }
+ client = select_client_resource(ua);
+ }
+ } else {
+ client = job->client; /* use default */
+ }
+ if (!client) {
+ return 0;
+ } else if (!acl_access_ok(ua, Client_ACL, client->name())) {
+ ua->error_msg(_("No authorization. Client \"%s\".\n"),
+ client->name());
+ return 0;
+ }
+ Dmsg1(800, "Using restore client=%s\n", client->name());
+
+
if (fileset_name) {
fileset = (FILESET *)GetResWithName(R_FILESET, fileset_name);
if (!fileset) {
- bsendmsg(ua, _("FileSet \"%s\" not found.\n"), fileset_name);
+ ua->send_msg(_("FileSet \"%s\" not found.\n"), fileset_name);
fileset = select_fileset_resource(ua);
}
} else {
if (!fileset) {
return 0;
} else if (!acl_access_ok(ua, FileSet_ACL, fileset->name())) {
- bsendmsg(ua, _("No authorization. FileSet \"%s\".\n"),
+ ua->send_msg(_("No authorization. FileSet \"%s\".\n"),
fileset->name());
return 0;
}
if (verify_job_name) {
verify_job = (JOB *)GetResWithName(R_JOB, verify_job_name);
if (!verify_job) {
- bsendmsg(ua, _("Verify Job \"%s\" not found.\n"), verify_job_name);
+ ua->send_msg(_("Verify Job \"%s\" not found.\n"), verify_job_name);
verify_job = select_job_resource(ua);
}
} else {
if (previous_job_name) {
previous_job = (JOB *)GetResWithName(R_JOB, previous_job_name);
if (!previous_job) {
- bsendmsg(ua, _("Migration Job \"%s\" not found.\n"), previous_job_name);
+ ua->send_msg(_("Migration Job \"%s\" not found.\n"), previous_job_name);
previous_job = select_job_resource(ua);
}
} else {
jcr->where = bstrdup(where);
}
+ if (regexwhere) {
+ if (jcr->RegexWhere) {
+ free(jcr->RegexWhere);
+ }
+ jcr->RegexWhere = bstrdup(regexwhere);
+ }
+
if (when) {
jcr->sched_time = str_to_utime(when);
if (jcr->sched_time == 0) {
- bsendmsg(ua, _("Invalid time, using current time.\n"));
+ ua->send_msg(_("Invalid time, using current time.\n"));
jcr->sched_time = time(NULL);
}
}
}
}
if (!jcr->replace) {
- bsendmsg(ua, _("Invalid replace option: %s\n"), replace);
+ ua->send_msg(_("Invalid replace option: %s\n"), replace);
goto bail_out;
}
} else if (job->replace) {
}
if (level_name) {
if (!get_level_from_name(jcr, level_name)) {
- bsendmsg(ua, _("Level %s not valid.\n"), level_name);
+ ua->send_msg(_("Level %s not valid.\n"), level_name);
goto bail_out;
}
}
* Prompt User to see if all run job parameters are correct, and
* allow him to modify them.
*/
- if (!display_job_parameters(ua, jcr, job, verify_list, jid, replace)) {
+ if (!display_job_parameters(ua, jcr, job, verify_list, jid, replace,
+ client_name)) {
goto bail_out;
}
add_prompt(ua, _("Storage")); /* 1 */
add_prompt(ua, _("Job")); /* 2 */
add_prompt(ua, _("FileSet")); /* 3 */
- add_prompt(ua, _("Client")); /* 4 */
+ if (jcr->JobType == JT_RESTORE) {
+ add_prompt(ua, _("Restore Client")); /* 4 */
+ } else {
+ add_prompt(ua, _("Client")); /* 4 */
+ }
add_prompt(ua, _("When")); /* 5 */
add_prompt(ua, _("Priority")); /* 6 */
if (jcr->JobType == JT_BACKUP ||
} else if (jcr->JobType == JT_RESTORE) {
add_prompt(ua, _("Bootstrap")); /* 7 */
add_prompt(ua, _("Where")); /* 8 */
- add_prompt(ua, _("Replace")); /* 9 */
- add_prompt(ua, _("JobId")); /* 10 */
+ add_prompt(ua, _("File Relocation"));/* 9 */
+ add_prompt(ua, _("Replace")); /* 10 */
+ add_prompt(ua, _("JobId")); /* 11 */
}
switch (do_prompt(ua, "", _("Select parameter to modify"), NULL, 0)) {
case 0:
} else {
jcr->sched_time = str_to_utime(ua->cmd);
if (jcr->sched_time == 0) {
- bsendmsg(ua, _("Invalid time, using current time.\n"));
+ ua->send_msg(_("Invalid time, using current time.\n"));
jcr->sched_time = time(NULL);
}
}
break;
}
if (ua->pint32_val == 0) {
- bsendmsg(ua, _("Priority must be a positive integer.\n"));
+ ua->send_msg(_("Priority must be a positive integer.\n"));
} else {
jcr->JobPriority = ua->pint32_val;
}
jcr->RestoreBootstrap = bstrdup(ua->cmd);
fd = fopen(jcr->RestoreBootstrap, "rb");
if (!fd) {
- bsendmsg(ua, _("Warning cannot open %s: ERR=%s\n"),
+ ua->send_msg(_("Warning cannot open %s: ERR=%s\n"),
jcr->RestoreBootstrap, strerror(errno));
free(jcr->RestoreBootstrap);
jcr->RestoreBootstrap = NULL;
if (!get_cmd(ua, _("Please enter path prefix for restore (/ for none): "))) {
break;
}
+ if (jcr->RegexWhere) { /* cannot use regexwhere and where */
+ free(jcr->RegexWhere);
+ jcr->RegexWhere = NULL;
+ }
if (jcr->where) {
free(jcr->where);
jcr->where = NULL;
}
jcr->where = bstrdup(ua->cmd);
goto try_again;
- case 9:
+ case 9:
+ /* File relocation */
+ select_where_regexp(ua, jcr);
+ goto try_again;
+ case 10:
/* Replace */
start_prompt(ua, _("Replace:\n"));
for (i=0; ReplaceOptions[i].name; i++) {
jcr->replace = ReplaceOptions[opt].token;
}
goto try_again;
- case 10:
+ case 11:
/* JobId */
jid = NULL; /* force reprompt */
jcr->RestoreJobId = 0;
if (jcr->RestoreBootstrap) {
- bsendmsg(ua, _("You must set the bootstrap file to NULL to be able to specify a JobId.\n"));
+ ua->send_msg(_("You must set the bootstrap file to NULL to be able to specify a JobId.\n"));
}
goto try_again;
case -1: /* error or cancel */
Dmsg1(100, "Using pool %s\n", jcr->pool->name());
JobId = run_job(jcr);
#if 0
- bsendmsg(ua, "<job director=\"console\" time=\"%u\" status=\"%c\" type=\"%c\" "
+ ua->send_msg("<job director=\"console\" time=\"%u\" status=\"%c\" type=\"%c\" "
"jobid=\"%u\" job=\"%s\" level=\"%c\" finished=\"false\" priority=\"%u\"/>\n",
time(NULL), jcr->JobStatus, jcr->JobType, jcr->JobId,
jcr->Job, jcr->JobLevel, jcr->JobPriority);
#endif
free_jcr(jcr); /* release jcr */
if (JobId == 0) {
- bsendmsg(ua, _("Job failed.\n"));
+ ua->error_msg(_("Job failed.\n"));
} else {
char ed1[50];
- bsendmsg(ua, _("Job queued. JobId=%s\n"), edit_int64(JobId,ed1));
+ ua->send_msg(_("Job queued. JobId=%s\n"), edit_int64(JobId,ed1));
}
return JobId;
}
bail_out:
- bsendmsg(ua, _("Job not run.\n"));
+ ua->send_msg(_("Job not run.\n"));
free_jcr(jcr);
return 0; /* do not run */
}
+static void select_where_regexp(UAContext *ua, JCR *jcr)
+{
+ alist *regs;
+ char *strip_prefix, *add_prefix, *add_suffix, *rwhere;
+ strip_prefix = add_suffix = rwhere = add_prefix = NULL;
+
+try_again_reg:
+ ua->send_msg(_("strip_prefix=%s add_prefix=%s add_suffix=%s\n"),
+ NPRT(strip_prefix), NPRT(add_prefix), NPRT(add_suffix));
+
+ start_prompt(ua, _("This will replace your current Where value\n"));
+ add_prompt(ua, _("Strip prefix")); /* 0 */
+ add_prompt(ua, _("Add prefix")); /* 1 */
+ add_prompt(ua, _("Add file suffix")); /* 2 */
+ add_prompt(ua, _("Enter a regexp")); /* 3 */
+ add_prompt(ua, _("Test filename manipulation")); /* 4 */
+ add_prompt(ua, _("Use this ?")); /* 5 */
+
+ switch (do_prompt(ua, "", _("Select parameter to modify"), NULL, 0)) {
+ case 0:
+ /* Strip prefix */
+ if (get_cmd(ua, _("Please enter path prefix to strip: "))) {
+ if (strip_prefix) bfree(strip_prefix);
+ strip_prefix = bstrdup(ua->cmd);
+ }
+
+ goto try_again_reg;
+ case 1:
+ /* Add prefix */
+ if (get_cmd(ua, _("Please enter path prefix to add (/ for none): "))) {
+ if (IsPathSeparator(ua->cmd[0]) && ua->cmd[1] == '\0') {
+ ua->cmd[0] = 0;
+ }
+
+ if (add_prefix) bfree(add_prefix);
+ add_prefix = bstrdup(ua->cmd);
+ }
+ goto try_again_reg;
+ case 2:
+ /* Add suffix */
+ if (get_cmd(ua, _("Please enter file suffix to add: "))) {
+ if (add_suffix) bfree(add_suffix);
+ add_suffix = bstrdup(ua->cmd);
+ }
+ goto try_again_reg;
+ case 3:
+ /* Add rwhere */
+ if (get_cmd(ua, _("Please enter a valid regexp (!from!to!): "))) {
+ if (rwhere) bfree(rwhere);
+ rwhere = bstrdup(ua->cmd);
+ }
+
+ goto try_again_reg;
+ case 4:
+ /* Test regexp */
+ char *result;
+ char *regexp;
+
+ if (rwhere && rwhere[0] != '\0') {
+ regs = get_bregexps(rwhere);
+ ua->send_msg(_("regexwhere=%s\n"), NPRT(rwhere));
+ } else {
+ int len = bregexp_get_build_where_size(strip_prefix, add_prefix, add_suffix);
+ regexp = (char *) bmalloc (len * sizeof(char));
+ bregexp_build_where(regexp, len, strip_prefix, add_prefix, add_suffix);
+ regs = get_bregexps(regexp);
+ ua->send_msg(_("strip_prefix=%s add_prefix=%s add_suffix=%s result=%s\n"),
+ NPRT(strip_prefix), NPRT(add_prefix), NPRT(add_suffix), NPRT(regexp));
+
+ bfree(regexp);
+ }
+
+ if (!regs) {
+ ua->send_msg(_("Cannot use your regexp\n"));
+ goto try_again_reg;
+ }
+
+ while (get_cmd(ua, _("Please enter filename to test: "))) {
+ apply_bregexps(ua->cmd, regs, &result);
+ ua->send_msg(_("%s -> %s\n"), ua->cmd, result);
+ }
+ free_bregexps(regs);
+ delete regs;
+ goto try_again_reg;
+
+ case 5:
+ /* OK */
+ break;
+ case -1: /* error or cancel */
+ goto bail_out_reg;
+ default:
+ goto try_again_reg;
+ }
+
+ /* replace the existing where */
+ if (jcr->where) {
+ bfree(jcr->where);
+ jcr->where = NULL;
+ }
+
+ /* replace the existing regexwhere */
+ if (jcr->RegexWhere) {
+ bfree(jcr->RegexWhere);
+ jcr->RegexWhere = NULL;
+ }
+
+ if (rwhere) {
+ jcr->RegexWhere = bstrdup(rwhere);
+ } else if (strip_prefix || add_prefix || add_suffix) {
+ int len = bregexp_get_build_where_size(strip_prefix, add_prefix, add_suffix);
+ jcr->RegexWhere = (char *) bmalloc(len*sizeof(char));
+ bregexp_build_where(jcr->RegexWhere, len, strip_prefix, add_prefix, add_suffix);
+ }
+
+ regs = get_bregexps(jcr->RegexWhere);
+ if (regs) {
+ free_bregexps(regs);
+ delete regs;
+ } else {
+ if (jcr->RegexWhere) {
+ bfree(jcr->RegexWhere);
+ jcr->RegexWhere = NULL;
+ }
+ ua->send_msg(_("Cannot use your regexp.\n"));
+ }
+
+bail_out_reg:
+ if (strip_prefix) bfree(strip_prefix);
+ if (add_prefix) bfree(add_prefix);
+ if (add_suffix) bfree(add_suffix);
+ if (rwhere) bfree(rwhere);
+}
+
static void select_job_level(UAContext *ua, JCR *jcr)
{
if (jcr->JobType == JT_BACKUP) {
break;
}
} else {
- bsendmsg(ua, _("Level not appropriate for this Job. Cannot be changed.\n"));
+ ua->warning_msg(_("Level not appropriate for this Job. Cannot be changed.\n"));
}
return;
}
static bool display_job_parameters(UAContext *ua, JCR *jcr, JOB *job, char *verify_list,
- char *jid, const char *replace)
+ char *jid, const char *replace, char *client_name)
{
Dmsg1(800, "JobType=%c\n", jcr->JobType);
switch (jcr->JobType) {
char ec1[30];
char dt[MAX_TIME_LENGTH];
case JT_ADMIN:
- bsendmsg(ua, _("Run %s job\n"
- "JobName: %s\n"
- "FileSet: %s\n"
- "Client: %s\n"
- "Storage: %s\n"
- "When: %s\n"
- "Priority: %d\n"),
+ if (ua->api) ua->signal(BNET_RUN_CMD);
+ ua->send_msg(_("Run %s job\n"
+ "JobName: %s\n"
+ "FileSet: %s\n"
+ "Client: %s\n"
+ "Storage: %s\n"
+ "When: %s\n"
+ "Priority: %d\n"),
_("Admin"),
job->name(),
jcr->fileset->name(),
case JT_BACKUP:
case JT_VERIFY:
if (jcr->JobType == JT_BACKUP) {
- bsendmsg(ua, _("Run %s job\n"
+ if (ua->api) ua->signal(BNET_RUN_CMD);
+ ua->send_msg(_("Run %s job\n"
"JobName: %s\n"
"Level: %s\n"
"Client: %s\n"
if (!verify_list) {
verify_list = "";
}
- bsendmsg(ua, _("Run %s job\n"
+ if (ua->api) ua->signal(BNET_RUN_CMD);
+ ua->send_msg(_("Run %s job\n"
"JobName: %s\n"
"Level: %s\n"
"Client: %s\n"
jcr->JobLevel = L_FULL; /* default level */
Dmsg1(800, "JobId to restore=%d\n", jcr->RestoreJobId);
if (jcr->RestoreJobId == 0) {
- bsendmsg(ua, _("Run Restore job\n"
+ if (ua->api) ua->signal(BNET_RUN_CMD);
+ /* RegexWhere is take before RestoreWhere */
+ if (jcr->RegexWhere || (job->RegexWhere && !jcr->where)) {
+ ua->send_msg(_("Run Restore job\n"
+ "JobName: f%s\n"
+ "Bootstrap: %s\n"
+ "RegexWhere: %s\n"
+ "Replace: %s\n"
+ "FileSet: %s\n"
+ "Backup Client: %s\n"
+ "Restore Client: %s\n"
+ "Storage: %s\n"
+ "When: %s\n"
+ "Catalog: %s\n"
+ "Priority: %d\n"),
+ job->name(),
+ NPRT(jcr->RestoreBootstrap),
+ jcr->RegexWhere?jcr->RegexWhere:job->RegexWhere,
+ replace,
+ jcr->fileset->name(),
+ client_name,
+ jcr->client->name(),
+ jcr->rstore->name(),
+ bstrutime(dt, sizeof(dt), jcr->sched_time),
+ jcr->catalog->name(),
+ jcr->JobPriority);
+
+ } else {
+ ua->send_msg(_("Run Restore job\n"
+ "JobName: %s\n"
+ "Bootstrap: %s\n"
+ "Where: %s\n"
+ "Replace: %s\n"
+ "FileSet: %s\n"
+ "Backup Client: %s\n"
+ "Restore Client: %s\n"
+ "Storage: %s\n"
+ "When: %s\n"
+ "Catalog: %s\n"
+ "Priority: %d\n"),
+ job->name(),
+ NPRT(jcr->RestoreBootstrap),
+ jcr->where?jcr->where:NPRT(job->RestoreWhere),
+ replace,
+ jcr->fileset->name(),
+ client_name,
+ jcr->client->name(),
+ jcr->rstore->name(),
+ bstrutime(dt, sizeof(dt), jcr->sched_time),
+ jcr->catalog->name(),
+ jcr->JobPriority);
+ }
+
+ } else {
+ if (ua->api) ua->signal(BNET_RUN_CMD);
+ ua->send_msg(_("Run Restore job\n"
"JobName: %s\n"
- "Bootstrap: %s\n"
- "Where: %s\n"
- "Replace: %s\n"
- "FileSet: %s\n"
+ "Bootstrap: %s\n"),
+ job->name(),
+ NPRT(jcr->RestoreBootstrap));
+
+ /* RegexWhere is take before RestoreWhere */
+ if (jcr->RegexWhere || (job->RegexWhere && !jcr->where)) {
+ ua->send_msg(_("RegexWhere: %s\n"),
+ jcr->RegexWhere?jcr->RegexWhere:job->RegexWhere);
+ } else {
+ ua->send_msg(_("Where: %s\n"),
+ jcr->where?jcr->where:NPRT(job->RestoreWhere));
+ }
+
+ ua->send_msg(_("Replace: %s\n"
"Client: %s\n"
"Storage: %s\n"
+ "JobId: %s\n"
"When: %s\n"
"Catalog: %s\n"
"Priority: %d\n"),
- job->name(),
- NPRT(jcr->RestoreBootstrap),
- jcr->where?jcr->where:NPRT(job->RestoreWhere),
- replace,
- jcr->fileset->name(),
- jcr->client->name(),
- jcr->rstore->name(),
- bstrutime(dt, sizeof(dt), jcr->sched_time),
- jcr->catalog->name(),
- jcr->JobPriority);
- } else {
- bsendmsg(ua, _("Run Restore job\n"
- "JobName: %s\n"
- "Bootstrap: %s\n"
- "Where: %s\n"
- "Replace: %s\n"
- "Client: %s\n"
- "Storage: %s\n"
- "JobId: %s\n"
- "When: %s\n"
- "Catalog: %s\n"
- "Priority: %d\n"),
- job->name(),
- NPRT(jcr->RestoreBootstrap),
- jcr->where?jcr->where:NPRT(job->RestoreWhere),
replace,
jcr->client->name(),
jcr->rstore->name(),
break;
case JT_MIGRATE:
jcr->JobLevel = L_FULL; /* default level */
- bsendmsg(ua, _("Run Migration job\n"
+ if (ua->api) ua->signal(BNET_RUN_CMD);
+ ua->send_msg(_("Run Migration job\n"
"JobName: %s\n"
"Bootstrap: %s\n"
"Client: %s\n"
jcr->JobPriority);
break;
default:
- bsendmsg(ua, _("Unknown Job Type=%d\n"), jcr->JobType);
+ ua->error_msg(_("Unknown Job Type=%d\n"), jcr->JobType);
return false;
}
return true;