"\n\t pool=<pool> recycle=<yes/no> slot=<number>\n\t inchanger=<yes/no>"
"\n\t maxvolbytes=<size> maxvolfiles=<nb> maxvoljobs=<nb>"
"\n\t enabled=<yes/no> recyclepool=<pool> actiononpurge=<action>"
- "\n\t allfrompool=<pool> fromallpools"),true},
+ "\n\t allfrompool=<pool> fromallpools frompool"),true},
{ NT_("use"), use_cmd, _("Use catalog xxx"), NT_("catalog=<catalog>"), false},
{ NT_("var"), var_cmd, _("Does variable expansion"), NT_(""), false},
{ NT_("version"), version_cmd, _("Print Director version"), NT_(""), true},
return false;
}
- while (ua->jcr->wstorage->size()) {
- ua->jcr->wstorage->remove(0);
+ if (ua->jcr->wstorage) {
+ while (ua->jcr->wstorage->size()) {
+ ua->jcr->wstorage->remove(0);
+ }
}
len = strlen(ua->argk[0]);
{
POOL_DBR pr;
+ if (pool->ScratchPool == pool) {
+ Jmsg(NULL, M_WARNING, 0,
+ _("The ScratchPool directive for Pool \"%s\" is incorrect. Using default Scratch pool instead.\n"),
+ pool->name());
+ pool->ScratchPool = NULL;
+ }
+
if (!pool->RecyclePool && !pool->ScratchPool) {
return 1;
}
return 1;
}
+static void do_dir_setdebug(UAContext *ua, int64_t level, int trace_flag, char *options, int64_t tags)
+{
+ debug_level = level;
+ debug_level_tags = tags;
+ set_trace(trace_flag);
+ set_debug_flags(options);
+}
+
static void do_storage_setdebug(UAContext *ua, STORE *store,
int64_t level, int trace_flag, int hangup, int blowup,
char *options, char *tags)
STORE *store, **unique_store;
CLIENT *client, **unique_client;
int i, j, found;
+ int64_t t=0;
/* Director */
- debug_level = level;
+ debug_parse_tags(tags, &t);
+ do_dir_setdebug(ua, level, trace_flag, options, t);
/* Count Storage items */
LockRes();
}
if (strcasecmp(ua->argk[i], "dir") == 0 ||
strcasecmp(ua->argk[i], "director") == 0) {
- debug_level = level;
- debug_level_tags = tags;
- set_trace(trace_flag);
- set_debug_flags(options);
+ do_dir_setdebug(ua, level, trace_flag, options, tags);
return 1;
}
if (strcasecmp(ua->argk[i], "client") == 0 ||
add_prompt(ua, _("All"));
switch(do_prompt(ua, "", _("Select daemon type to set debug level"), NULL, 0)) {
case 0: /* Director */
- debug_level = level;
- set_trace(trace_flag);
- set_debug_flags(options);
+ do_dir_setdebug(ua, level, trace_flag, options, tags);
break;
case 1:
store = get_storage_resource(ua, false/*no default*/, true/*unique*/);
for (bool running=true; running; ) {
running = false;
foreach_jcr(jcr) {
- if (jcr->JobId != 0) {
+ if (!jcr->is_internal_job()) {
running = true;
break;
}
} else if (strcasecmp(ua->argk[i], "mount") == 0) {
for (bool waiting=false; !waiting; ) {
foreach_jcr(jcr) {
- if (jcr->JobId != 0 &&
+ if (!jcr->is_internal_job() &&
(jcr->JobStatus == JS_WaitMedia || jcr->JobStatus == JS_WaitMount)) {
waiting = true;
break;
ua->catalog->db_user,
ua->catalog->db_password, ua->catalog->db_address,
ua->catalog->db_port, ua->catalog->db_socket,
+ ua->catalog->db_ssl_key, ua->catalog->db_ssl_cert,
+ ua->catalog->db_ssl_ca, ua->catalog->db_ssl_capath,
+ ua->catalog->db_ssl_cipher,
mult_db_conn, ua->catalog->disable_batch_insert);
if (!ua->db || !db_open_database(ua->jcr, ua->db)) {
ua->error_msg(_("Could not open catalog database \"%s\".\n"),