static void usage()
{
fprintf(stderr, _(
-"Copyright (C) 2000-%s Kern Sibbald.\n"
+PROG_COPYRIGHT
"\nVersion: %s (%s)\n\n"
"Usage: dird [-f -s] [-c config_file] [-d debug_level] [config_file]\n"
" -c <file> set configuration file to file\n"
" -u userid\n"
" -v verbose user messages\n"
" -? print this message.\n"
-"\n"), BYEAR, VERSION, BDATE);
+"\n"), 2000, VERSION, BDATE);
exit(1);
}
terminate_dird(0);
}
- my_name_is(0, NULL, director->hdr.name); /* set user defined name */
+ my_name_is(0, NULL, director->name()); /* set user defined name */
/* Plug database interface for library routines */
p_sql_query = (sql_query)dir_sql_query;
init_console_msg(working_directory);
- init_python_interpreter(director->hdr.name, director->scripts_directory,
+ init_python_interpreter(director->name(), director->scripts_directory,
"DirStartUp");
set_thread_concurrency(director->MaxConcurrentJobs * 2 +
init_job_server(director->MaxConcurrentJobs);
+// init_device_resources();
+
Dmsg0(200, "wait for next job\n");
/* Main loop -- call scheduler to get next job to run */
while ( (jcr = wait_for_next_job(runjob)) ) {
exit(1);
}
already_here = true;
+ stop_watchdog();
generate_daemon_event(NULL, "Exit");
write_state_file(director->working_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs));
delete_pid_file(director->pid_directory, "bacula-dir", get_first_port_host_order(director->DIRaddrs));
free_config_resources();
term_ua_server();
term_msg(); /* terminate message handler */
- stop_watchdog();
cleanup_crypto();
close_memory_pool(); /* release free memory in pool */
sm_dump(false);
if (!director->tls_certfile && director->tls_enable) {
Jmsg(NULL, M_FATAL, 0, _("\"TLS Certificate\" file not defined for Director \"%s\" in %s.\n"),
- director->hdr.name, configfile);
+ director->name(), configfile);
OK = false;
}
if (!director->tls_keyfile && director->tls_enable) {
Jmsg(NULL, M_FATAL, 0, _("\"TLS Key\" file not defined for Director \"%s\" in %s.\n"),
- director->hdr.name, configfile);
+ director->name(), configfile);
OK = false;
}
" Certificate Dir\" are defined for Director \"%s\" in %s."
" At least one CA certificate store is required"
" when using \"TLS Verify Peer\".\n"),
- director->hdr.name, configfile);
+ director->name(), configfile);
OK = false;
}
if (!director->tls_ctx) {
Jmsg(NULL, M_FATAL, 0, _("Failed to initialize TLS context for Director \"%s\" in %s.\n"),
- director->hdr.name, configfile);
+ director->name(), configfile);
OK = false;
}
}
uint32_t offset;
Dmsg4(1400, "Job \"%s\", field \"%s\" bit=%d def=%d\n",
- job->hdr.name, job_items[i].name,
+ job->name(), job_items[i].name,
bit_is_set(i, job->hdr.item_present),
bit_is_set(i, job->jobdefs->hdr.item_present));
if (!bit_is_set(i, job->hdr.item_present) &&
bit_is_set(i, job->jobdefs->hdr.item_present)) {
Dmsg2(400, "Job \"%s\", field \"%s\": getting default.\n",
- job->hdr.name, job_items[i].name);
+ job->name(), job_items[i].name);
offset = (char *)(job_items[i].value) - (char *)&res_all;
/*
* Handle strings and directory strings
job_items[i].handler == store_dir) {
def_svalue = (char **)((char *)(job->jobdefs) + offset);
Dmsg5(400, "Job \"%s\", field \"%s\" def_svalue=%s item %d offset=%u\n",
- job->hdr.name, job_items[i].name, *def_svalue, i, offset);
+ job->name(), job_items[i].name, *def_svalue, i, offset);
svalue = (char **)((char *)job + offset);
if (*svalue) {
Pmsg1(000, _("Hey something is wrong. p=0x%lu\n"), *svalue);
} else if (job_items[i].handler == store_res) {
def_svalue = (char **)((char *)(job->jobdefs) + offset);
Dmsg4(400, "Job \"%s\", field \"%s\" item %d offset=%u\n",
- job->hdr.name, job_items[i].name, i, offset);
+ job->name(), job_items[i].name, i, offset);
svalue = (char **)((char *)job + offset);
if (*svalue) {
Pmsg1(000, _("Hey something is wrong. p=0x%lu\n"), *svalue);
job_items[i].handler == store_replace) {
def_ivalue = (int *)((char *)(job->jobdefs) + offset);
Dmsg5(400, "Job \"%s\", field \"%s\" def_ivalue=%d item %d offset=%u\n",
- job->hdr.name, job_items[i].name, *def_ivalue, i, offset);
+ job->name(), job_items[i].name, *def_ivalue, i, offset);
ivalue = (int *)((char *)job + offset);
*ivalue = *def_ivalue;
set_bit(i, job->hdr.item_present);
job_items[i].handler == store_int64) {
def_lvalue = (int64_t *)((char *)(job->jobdefs) + offset);
Dmsg5(400, "Job \"%s\", field \"%s\" def_lvalue=%" lld " item %d offset=%u\n",
- job->hdr.name, job_items[i].name, *def_lvalue, i, offset);
+ job->name(), job_items[i].name, *def_lvalue, i, offset);
lvalue = (int64_t *)((char *)job + offset);
*lvalue = *def_lvalue;
set_bit(i, job->hdr.item_present);
} else if (job_items[i].handler == store_bool) {
def_bvalue = (bool *)((char *)(job->jobdefs) + offset);
Dmsg5(400, "Job \"%s\", field \"%s\" def_bvalue=%d item %d offset=%u\n",
- job->hdr.name, job_items[i].name, *def_bvalue, i, offset);
+ job->name(), job_items[i].name, *def_bvalue, i, offset);
bvalue = (bool *)((char *)job + offset);
*bvalue = *def_bvalue;
set_bit(i, job->hdr.item_present);
if (job_items[i].flags & ITEM_REQUIRED) {
if (!bit_is_set(i, job->hdr.item_present)) {
Jmsg(NULL, M_FATAL, 0, _("\"%s\" directive in Job \"%s\" resource is required, but not found.\n"),
- job_items[i].name, job->hdr.name);
+ job_items[i].name, job->name());
OK = false;
}
}
Emsg0(M_ERROR_TERM, 0, _("Too many items in Job resource\n"));
}
}
+ if (!job->storage && !job->pool->storage) {
+ Jmsg(NULL, M_FATAL, 0, _("No storage specified in Job \"%s\" nor in Pool.\n"),
+ job->name());
+ OK = false;
+ }
} /* End loop over Job res */
/* Loop over databases */
catalog->mult_db_connections);
if (!db || !db_open_database(NULL, db)) {
Jmsg(NULL, M_FATAL, 0, _("Could not open Catalog \"%s\", database \"%s\".\n"),
- catalog->hdr.name, catalog->db_name);
+ catalog->name(), catalog->db_name);
if (db) {
Jmsg(NULL, M_FATAL, 0, _("%s"), db_strerror(db));
}
if ((!store->tls_ca_certfile && !store->tls_ca_certdir) && store->tls_enable) {
Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate\""
" or \"TLS CA Certificate Dir\" are defined for Storage \"%s\" in %s.\n"),
- store->hdr.name, configfile);
+ store->name(), configfile);
OK = false;
}
if (!store->tls_ctx) {
Jmsg(NULL, M_FATAL, 0, _("Failed to initialize TLS context for Storage \"%s\" in %s.\n"),
- store->hdr.name, configfile);
+ store->name(), configfile);
OK = false;
}
}
/* Write to catalog? */
if (!counter->created && counter->Catalog == catalog) {
COUNTER_DBR cr;
- bstrncpy(cr.Counter, counter->hdr.name, sizeof(cr.Counter));
+ bstrncpy(cr.Counter, counter->name(), sizeof(cr.Counter));
cr.MinValue = counter->MinValue;
cr.MaxValue = counter->MaxValue;
cr.CurrentValue = counter->MinValue;
if (counter->WrapCounter) {
- bstrncpy(cr.WrapCounter, counter->WrapCounter->hdr.name, sizeof(cr.WrapCounter));
+ bstrncpy(cr.WrapCounter, counter->WrapCounter->name(), sizeof(cr.WrapCounter));
} else {
cr.WrapCounter[0] = 0; /* empty string */
}
if (db_create_counter_record(NULL, db, &cr)) {
counter->CurrentValue = cr.CurrentValue;
counter->created = true;
- Dmsg2(100, "Create counter %s val=%d\n", counter->hdr.name, counter->CurrentValue);
+ Dmsg2(100, "Create counter %s val=%d\n", counter->name(), counter->CurrentValue);
}
}
if (!counter->created) {
if (!cons->tls_certfile && cons->tls_enable) {
Jmsg(NULL, M_FATAL, 0, _("\"TLS Certificate\" file not defined for Console \"%s\" in %s.\n"),
- cons->hdr.name, configfile);
+ cons->name(), configfile);
OK = false;
}
if (!cons->tls_keyfile && cons->tls_enable) {
Jmsg(NULL, M_FATAL, 0, _("\"TLS Key\" file not defined for Console \"%s\" in %s.\n"),
- cons->hdr.name, configfile);
+ cons->name(), configfile);
OK = false;
}
" Certificate Dir\" are defined for Console \"%s\" in %s."
" At least one CA certificate store is required"
" when using \"TLS Verify Peer\".\n"),
- cons->hdr.name, configfile);
+ cons->name(), configfile);
OK = false;
}
/* If everything is well, attempt to initialize our per-resource TLS context */
if (!cons->tls_ctx) {
Jmsg(NULL, M_FATAL, 0, _("Failed to initialize TLS context for File daemon \"%s\" in %s.\n"),
- cons->hdr.name, configfile);
+ cons->name(), configfile);
OK = false;
}
}
if ((!client->tls_ca_certfile && !client->tls_ca_certdir) && client->tls_enable) {
Jmsg(NULL, M_FATAL, 0, _("Neither \"TLS CA Certificate\""
" or \"TLS CA Certificate Dir\" are defined for File daemon \"%s\" in %s.\n"),
- client->hdr.name, configfile);
+ client->name(), configfile);
OK = false;
}
if (!client->tls_ctx) {
Jmsg(NULL, M_FATAL, 0, _("Failed to initialize TLS context for File daemon \"%s\" in %s.\n"),
- client->hdr.name, configfile);
+ client->name(), configfile);
OK = false;
}
}