extern int r_first;
extern int r_last;
extern struct s_res resources[];
-extern char my_name[];
extern jobq_t job_queue; /* job queue */
struct cmdstruct { const char *key; int (*func)(UAContext *ua, const char *cmd); const char *help; };
static struct cmdstruct commands[] = {
- { N_("add"), add_cmd, _("add media to a pool")},
- { N_("autodisplay"), autodisplay_cmd, _("autodisplay [on|off] -- console messages")},
- { N_("automount"), automount_cmd, _("automount [on|off] -- after label")},
- { N_("cancel"), cancel_cmd, _("cancel [<jobid=nnn> | <job=name>] -- cancel a job")},
- { N_("create"), create_cmd, _("create DB Pool from resource")},
- { N_("delete"), delete_cmd, _("delete [pool=<pool-name> | media volume=<volume-name>]")},
- { N_("disable"), disable_cmd, _("disable <job=name> -- disable a job")},
- { N_("enable"), enable_cmd, _("enable <job=name> -- enable a job")},
- { N_("estimate"), estimate_cmd, _("performs FileSet estimate, listing gives full listing")},
- { N_("exit"), quit_cmd, _("exit = quit")},
- { N_("gui"), gui_cmd, _("gui [on|off] -- non-interactive gui mode")},
- { N_("help"), help_cmd, _("print this command")},
- { N_("list"), list_cmd, _("list [pools | jobs | jobtotals | media <pool=pool-name> | files <jobid=nn>]; from catalog")},
- { N_("label"), label_cmd, _("label a tape")},
- { N_("llist"), llist_cmd, _("full or long list like list command")},
- { N_("messages"), messagescmd, _("messages")},
- { N_("mount"), mount_cmd, _("mount <storage-name>")},
- { N_("prune"), prunecmd, _("prune expired records from catalog")},
- { N_("purge"), purgecmd, _("purge records from catalog")},
- { N_("python"), python_cmd, _("python control commands")},
- { N_("quit"), quit_cmd, _("quit")},
- { N_("query"), querycmd, _("query catalog")},
- { N_("restore"), restore_cmd, _("restore files")},
- { N_("relabel"), relabel_cmd, _("relabel a tape")},
- { N_("release"), release_cmd, _("release <storage-name>")},
- { N_("reload"), reload_cmd, _("reload conf file")},
- { N_("run"), run_cmd, _("run <job-name>")},
- { N_("status"), status_cmd, _("status [storage | client]=<name>")},
- { N_("setdebug"), setdebug_cmd, _("sets debug level")},
- { N_("setip"), setip_cmd, _("sets new client address -- if authorized")},
- { N_("show"), show_cmd, _("show (resource records) [jobs | pools | ... | all]")},
- { N_("sqlquery"), sqlquerycmd, _("use SQL to query catalog")},
- { N_("time"), time_cmd, _("print current time")},
- { N_("trace"), trace_cmd, _("turn on/off trace to file")},
- { N_("unmount"), unmount_cmd, _("unmount <storage-name>")},
- { N_("umount"), unmount_cmd, _("umount <storage-name> for old-time Unix guys")},
- { N_("update"), update_cmd, _("update Volume, Pool or slots")},
- { N_("use"), use_cmd, _("use catalog xxx")},
- { N_("var"), var_cmd, _("does variable expansion")},
- { N_("version"), version_cmd, _("print Director version")},
- { N_("wait"), wait_cmd, _("wait until no jobs are running [<jobname=name> | <jobid=nnn> | <ujobid=complete_name>]")},
+ { NT_("add"), add_cmd, _("add media to a pool")},
+ { NT_("autodisplay"), autodisplay_cmd, _("autodisplay [on|off] -- console messages")},
+ { NT_("automount"), automount_cmd, _("automount [on|off] -- after label")},
+ { NT_("cancel"), cancel_cmd, _("cancel [<jobid=nnn> | <job=name>] -- cancel a job")},
+ { NT_("create"), create_cmd, _("create DB Pool from resource")},
+ { N
T_("delete"), delete_cmd, _("delete [pool=<pool-name> | media volume=<volume-name>]")},
+ { NT_("disable"), disable_cmd, _("disable <job=name> -- disable a job")},
+ { NT_("enable"), enable_cmd, _("enable <job=name> -- enable a job")},
+ { NT_("estimate"), estimate_cmd, _("performs FileSet estimate, listing gives full listing")},
+ { NT_("exit"), quit_cmd, _("exit = quit")},
+ { NT_("gui"), gui_cmd, _("gui [on|off] -- non-interactive gui mode")},
+ { NT_("help"), help_cmd, _("print this command")},
+ { N
T_("list"), list_cmd, _("list [pools | jobs | jobtotals | media <pool=pool-name> | files <jobid=nn>]; from catalog")},
+ { NT_("label"), label_cmd, _("label a tape")},
+ { NT_("llist"), llist_cmd, _("full or long list like list command")},
+ { NT_("messages"), messagescmd, _("messages")},
+ { NT_("mount"), mount_cmd, _("mount <storage-name>")},
+ { NT_("prune"), prunecmd, _("prune expired records from catalog")},
+ { NT_("purge"), purgecmd, _("purge records from catalog")},
+ { NT_("python"), python_cmd, _("python control commands")},
+ { NT_("quit"), quit_cmd, _("quit")},
+ { NT_("query"), querycmd, _("query catalog")},
+ { NT_("restore"), restore_cmd, _("restore files")},
+ { NT_("relabel"), relabel_cmd, _("relabel a tape")},
+ { NT_("release"), release_cmd, _("release <storage-name>")},
+ { NT_("reload"), reload_cmd, _("reload conf file")},
+ { NT_("run"), run_cmd, _("run <job-name>")},
+ { NT_("status"), status_cmd, _("status [storage | client]=<name>")},
+ { NT_("setdebug"), setdebug_cmd, _("sets debug level")},
+ { NT_("setip"), setip_cmd, _("sets new client address -- if authorized")},
+ { NT_("show"), show_cmd, _("show (resource records) [jobs | pools | ... | all]")},
+ { NT_("sqlquery"), sqlquerycmd, _("use SQL to query catalog")},
+ { NT_("time"), time_cmd, _("print current time")},
+ { NT_("trace"), trace_cmd, _("turn on/off trace to file")},
+ { NT_("unmount"), unmount_cmd, _("unmount <storage-name>")},
+ { NT_("umount"), unmount_cmd, _("umount <storage-name> for old-time Unix guys")},
+ { NT_("update"), update_cmd, _("update Volume, Pool or slots")},
+ { NT_("use"), use_cmd, _("use catalog xxx")},
+ { NT_("var"), var_cmd, _("does variable expansion")},
+ { NT_("version"), version_cmd, _("print Director version")},
+ { NT_("wait"), wait_cmd, _("wait until no jobs are running [<jobname=name> | <jobid=nnn> | <ujobid=complete_name>]")},
};
#define comsize (sizeof(commands)/sizeof(struct cmdstruct))
return 1;
}
- while (ua->jcr->storage->size()) {
- ua->jcr->storage->remove(0);
+ while (ua->jcr->wstorage->size()) {
+ ua->jcr->wstorage->remove(0);
}
len = strlen(ua->argk[0]);
for (i=0; i<comsize; i++) { /* search for command */
- if (strncasecmp(ua->argk[0], _(commands[i].key), len) == 0) {
+ if (strncasecmp(ua->argk[0], commands[i].key, len) == 0) {
/* Check if command permitted, but "quit" is always OK */
- if (strcmp(ua->argk[0], "quit") != 0 &&
+ if (strcmp(ua->argk[0], NT_("quit")) != 0 &&
!acl_access_ok(ua, Command_ACL, ua->argk[0], len)) {
break;
}
void set_pool_dbr_defaults_in_media_dbr(MEDIA_DBR *mr, POOL_DBR *pr)
{
mr->PoolId = pr->PoolId;
- bstrncpy(mr->VolStatus, "Append", sizeof(mr->VolStatus));
+ bstrncpy(mr->VolStatus, NT_("Append"), sizeof(mr->VolStatus));
mr->Recycle = pr->Recycle;
mr->VolRetention = pr->VolRetention;
mr->VolUseDuration = pr->VolUseDuration;
mr->MaxVolFiles = pr->MaxVolFiles;
mr->MaxVolBytes = pr->MaxVolBytes;
mr->LabelType = pr->LabelType;
+ mr->Enabled = 1;
}
mr.Slot = Slot++;
mr.InChanger = InChanger;
mr.StorageId = store->StorageId;
+ mr.Enabled = 1;
Dmsg1(200, "Create Volume %s\n", mr.VolumeName);
if (!db_create_media_record(ua->jcr, ua->db, &mr)) {
bsendmsg(ua, "%s", db_strerror(ua->db));
onoff = ua->argk[1];
}
- ua->automount = (strcasecmp(onoff, _("off")) == 0) ? 0 : 1;
+ ua->automount = (strcasecmp(onoff, NT_("off")) == 0) ? 0 : 1;
return 1;
}
}
for (i=1; i<ua->argc; i++) {
- if (strcasecmp(ua->argk[i], _("jobid")) == 0) {
+ if (strcasecmp(ua->argk[i], NT_("jobid")) == 0) {
uint32_t JobId;
if (!ua->argv[i]) {
break;
return 1;
}
break;
- } else if (strcasecmp(ua->argk[i], _("job")) == 0) {
+ } else if (strcasecmp(ua->argk[i], NT_("job")) == 0) {
if (!ua->argv[i]) {
break;
}
bstrncpy(jcr->Job, ua->argv[i], sizeof(jcr->Job));
}
break;
- } else if (strcasecmp(ua->argk[i], _("ujobid")) == 0) {
+ } else if (strcasecmp(ua->argk[i], NT_("ujobid")) == 0) {
if (!ua->argv[i]) {
break;
}
pr->LabelType = pool->LabelType;
pr->UseOnce = pool->use_volume_once;
pr->UseCatalog = pool->use_catalog;
- pr->AcceptAnyVolume = pool->accept_any_volume;
pr->Recycle = pool->Recycle;
pr->VolRetention = pool->VolRetention;
pr->VolUseDuration = pool->VolUseDuration;
*/
static int python_cmd(UAContext *ua, const char *cmd)
{
- if (ua->argc >= 1 && strcasecmp(ua->argk[1], _("restart")) == 0) {
+ if (ua->argc >= 1 && strcasecmp(ua->argk[1], NT_("restart")) == 0) {
term_python_interpreter();
init_python_interpreter(director->hdr.name,
director->scripts_directory, "DirStartUp");
JOB *job;
int i;
- i = find_arg_with_value(ua, N_("job"));
+ i = find_arg_with_value(ua, NT_("job"));
if (i < 0) {
job = select_job_resource(ua);
if (!job) {
BSOCK *sd;
JCR *jcr = ua->jcr;
- set_storage(jcr, store);
+ set_wstorage(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(jcr, 1, 15, 0)) {
bsendmsg(ua, _("Failed to connect to Storage daemon.\n"));
return;
}
}
- if (strcasecmp(ua->argk[i], "store") == 0 ||
- strcasecmp(ua->argk[i], "storage") == 0 ||
- strcasecmp(ua->argk[i], "sd") == 0) {
+ if (strcasecmp(ua->argk[i], NT_("store")) == 0 ||
+ strcasecmp(ua->argk[i], NT_("storage")) == 0 ||
+ strcasecmp(ua->argk[i], NT_("sd")) == 0) {
store = NULL;
if (ua->argv[i]) {
store = (STORE *)GetResWithName(R_STORAGE, ua->argv[i]);
* prompt the user.
*/
start_prompt(ua, _("Available daemons are: \n"));
- add_prompt(ua, "Director");
- add_prompt(ua, "Storage");
- add_prompt(ua, "Client");
- add_prompt(ua, "All");
+ add_prompt(ua, _("Director"));
+ add_prompt(ua, _("Storage"));
+ add_prompt(ua, _("Client"));
+ add_prompt(ua, _("All"));
switch(do_prompt(ua, "", _("Select daemon type to set debug level"), NULL, 0)) {
case 0: /* Director */
debug_level = level;
onoff = ua->argk[1];
}
- set_trace((strcasecmp(onoff, _("off")) == 0) ? false : true);
+ set_trace((strcasecmp(onoff, NT_("off")) == 0) ? false : true);
return 1;
}
jcr->JobLevel = L_FULL;
for (int i=1; i<ua->argc; i++) {
- if (strcasecmp(ua->argk[i], "client") == 0 ||
- strcasecmp(ua->argk[i], "fd") == 0) {
+ if (strcasecmp(ua->argk[i], NT_("client")) == 0 ||
+ strcasecmp(ua->argk[i], NT_("fd")) == 0) {
if (ua->argv[i]) {
client = (CLIENT *)GetResWithName(R_CLIENT, ua->argv[i]);
continue;
}
}
- if (strcasecmp(ua->argk[i], "job") == 0) {
+ if (strcasecmp(ua->argk[i], NT_("job")) == 0) {
if (ua->argv[i]) {
job = (JOB *)GetResWithName(R_JOB, ua->argv[i]);
continue;
}
}
- if (strcasecmp(ua->argk[i], "fileset") == 0) {
+ if (strcasecmp(ua->argk[i], NT_("fileset")) == 0) {
if (ua->argv[i]) {
fileset = (FILESET *)GetResWithName(R_FILESET, ua->argv[i]);
continue;
}
}
- if (strcasecmp(ua->argk[i], "listing") == 0) {
+ if (strcasecmp(ua->argk[i], NT_("listing")) == 0) {
listing = 1;
continue;
}
- if (strcasecmp(ua->argk[i], "level") == 0) {
+ if (strcasecmp(ua->argk[i], NT_("level")) == 0) {
if (!get_level_from_name(ua->jcr, ua->argv[i])) {
bsendmsg(ua, _("Level %s not valid.\n"), ua->argv[i]);
}
char sdt[50];
time_t ttime = time(NULL);
struct tm tm;
- localtime_r(&ttime, &tm);
+ (void)localtime_r(&ttime, &tm);
strftime(sdt, sizeof(sdt), "%d-%b-%Y %H:%M:%S", &tm);
bsendmsg(ua, "%s\n", sdt);
return 1;
static int delete_cmd(UAContext *ua, const char *cmd)
{
static const char *keywords[] = {
- N_("volume"),
- N_("pool"),
- N_("jobid"),
+ NT_("volume"),
+ NT_("pool"),
+ NT_("jobid"),
NULL};
if (!open_db(ua)) {
JobId_t JobId;
char *s,*sep,*tok;
- int i = find_arg_with_value(ua, N_("jobid"));
+ int i = find_arg_with_value(ua, NT_("jobid"));
if (i >= 0) {
if (strchr(ua->argv[i], ',') != NULL || strchr(ua->argv[i], '-') != NULL) {
s = bstrdup(ua->argv[i]);
/*
* do_job_delete now performs the actual delete operation atomically
- * we always return 1 because C++ is pissy about void functions
*/
static void do_job_delete(UAContext *ua, JobId_t JobId)
{
- POOLMEM *query = get_pool_memory(PM_MESSAGE);
+ POOL_MEM query(PM_MESSAGE);
char ed1[50];
- Mmsg(query, "DELETE FROM Job WHERE JobId=%s", edit_int64(JobId, ed1));
- db_sql_query(ua->db, query, NULL, (void *)NULL);
- Mmsg(query, "DELETE FROM MAC WHERE JobId=%s", ed1);
- db_sql_query(ua->db, query, NULL, (void *)NULL);
- Mmsg(query, "DELETE FROM File WHERE JobId=%s", ed1);
- db_sql_query(ua->db, query, NULL, (void *)NULL);
- Mmsg(query, "DELETE FROM JobMedia WHERE JobId=%s", ed1);
- db_sql_query(ua->db, query, NULL, (void *)NULL);
- free_pool_memory(query);
+ purge_files_from_job(ua, JobId);
+ purge_job_from_catalog(ua, JobId);
bsendmsg(ua, _("Job %s and associated records deleted from the catalog.\n"), edit_int64(JobId, ed1));
}
JCR *jcr = ua->jcr;
char dev_name[MAX_NAME_LENGTH];
int drive;
+ int slot = -1;
if (!open_db(ua)) {
return;
if (!store) {
return;
}
- set_storage(jcr, store);
+ set_wstorage(jcr, store);
drive = get_storage_drive(ua, store);
+ if (strcmp(command, "mount") == 0) {
+ slot = get_storage_slot(ua, store);
+ }
Dmsg3(120, "Found storage, MediaType=%s DevName=%s drive=%d\n",
store->media_type, store->dev_name(), drive);
sd = jcr->store_bsock;
bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
bash_spaces(dev_name);
- bnet_fsend(sd, "%s %s drive=%d", command, dev_name, drive);
+ if (slot > 0) {
+ bnet_fsend(sd, "%s %s drive=%d slot=%d", command, dev_name, drive, slot);
+ } else {
+ bnet_fsend(sd, "%s %s drive=%d", command, dev_name, drive);
+ }
while (bnet_recv(sd) >= 0) {
bsendmsg(ua, "%s", sd->msg);
}
}
/*
- * mount [storage=<name>] [drive=nn]
+ * mount [storage=<name>] [drive=nn] [slot=mm]
*/
static int mount_cmd(UAContext *ua, const char *cmd)
{
unsigned int i;
for (i=0; i<comsize; i++) {
- bsendmsg(ua, "%s %s\n", _(commands[i].key), _(commands[i].help));
+ bsendmsg(ua, "%s %s\n", commands[i].key, _(commands[i].help));
}
return 1;
}
}
-/* A bit brain damaged in that if the user has not done
- * a "use catalog xxx" command, we simply find the first
- * catalog resource and open it.
+/*
+ * Open the catalog database.
*/
bool open_db(UAContext *ua)
{
return true;
}
if (!ua->catalog) {
- LockRes();
- ua->catalog = (CAT *)GetNextRes(R_CATALOG, NULL);
- UnlockRes();
+ ua->catalog = get_catalog_resource(ua);
if (!ua->catalog) {
bsendmsg(ua, _("Could not find a Catalog resource\n"));
return false;
- } else if (!acl_access_ok(ua, Catalog_ACL, ua->catalog->hdr.name)) {
- bsendmsg(ua, _("You must specify a \"use <catalog-name>\" command before continuing.\n"));
- ua->catalog = NULL;
- return false;
- } else {
- bsendmsg(ua, _("Using default Catalog name=%s DB=%s\n"),
- ua->catalog->hdr.name, ua->catalog->db_name);
}
}
projects / bacula / bacula / blobdiff