extern int do_backup(JCR *jcr);
extern void backup_cleanup(void);
extern void start_UA_server(char *addr, int port);
-extern void run_job(JCR *jcr);
extern void init_job_server(int max_workers);
static char *configfile = NULL;
textdomain("bacula-dir");
init_msg(NULL, NULL); /* initialize message handler */
daemon_start_time = time(NULL);
- memset(&last_job, 0, sizeof(last_job));
while ((ch = getopt(argc, argv, "c:d:fg:r:stu:v?")) != -1) {
switch (ch) {
case 'c': /* specify config file */
- if (configfile != NULL) {
- free(configfile);
- }
- configfile = bstrdup(optarg);
- break;
+ if (configfile != NULL) {
+ free(configfile);
+ }
+ configfile = bstrdup(optarg);
+ break;
- case 'd': /* set debug level */
- debug_level = atoi(optarg);
- if (debug_level <= 0) {
- debug_level = 1;
- }
- Dmsg1(0, "Debug level = %d\n", debug_level);
- break;
+ case 'd': /* set debug level */
+ debug_level = atoi(optarg);
+ if (debug_level <= 0) {
+ debug_level = 1;
+ }
+ Dmsg1(0, "Debug level = %d\n", debug_level);
+ break;
- case 'f': /* run in foreground */
- background = FALSE;
- break;
+ case 'f': /* run in foreground */
+ background = FALSE;
+ break;
- case 'g': /* set group id */
- gid = optarg;
- break;
+ case 'g': /* set group id */
+ gid = optarg;
+ break;
- case 'r': /* run job */
- if (runjob != NULL) {
- free(runjob);
- }
- if (optarg) {
- runjob = bstrdup(optarg);
- }
- break;
+ case 'r': /* run job */
+ if (runjob != NULL) {
+ free(runjob);
+ }
+ if (optarg) {
+ runjob = bstrdup(optarg);
+ }
+ break;
- case 's': /* turn off signals */
- no_signals = TRUE;
- break;
+ case 's': /* turn off signals */
+ no_signals = TRUE;
+ break;
- case 't': /* test config */
- test_config = TRUE;
- break;
+ case 't': /* test config */
+ test_config = TRUE;
+ break;
- case 'u': /* set uid */
- uid = optarg;
- break;
+ case 'u': /* set uid */
+ uid = optarg;
+ break;
- case 'v': /* verbose */
- verbose++;
- break;
+ case 'v': /* verbose */
+ verbose++;
+ break;
- case '?':
- default:
- usage();
+ case '?':
+ default:
+ usage();
}
}
if (!no_signals) {
init_signals(terminate_dird);
}
- signal(SIGCHLD, SIG_IGN);
if (argc) {
if (configfile != NULL) {
delete_pid_file(director->pid_directory, "bacula-dir",
director->DIRport);
stop_watchdog();
- signal(SIGCHLD, SIG_IGN); /* don't worry about children now */
+// signal(SIGCHLD, SIG_IGN); /* don't worry about children now */
term_scheduler();
if (runjob) {
free(runjob);
db = db_init_database(NULL, catalog->db_name, catalog->db_user,
catalog->db_password, catalog->db_address,
catalog->db_port, catalog->db_socket);
- if (!db_open_database(NULL, db)) {
- Jmsg(NULL, M_FATAL, 0, _("Could not open %s database \"%s\".\n"),
- catalog_db, catalog->db_name);
+ if (!db || !db_open_database(NULL, db)) {
+ Jmsg(NULL, M_FATAL, 0, _("Could not open database \"%s\".\n"),
+ catalog->db_name);
+ if (db) {
+ Jmsg(NULL, M_FATAL, 0, _("%s"), db_strerror(db));
+ }
OK = FALSE;
} else {
/* If a pool is defined for this job, create the pool DB
cr.MinValue = counter->MinValue;
cr.MaxValue = counter->MaxValue;
cr.CurrentValue = counter->MinValue;
- bstrncpy(cr.WrapCounter, counter->WrapCounter->hdr.name, sizeof(cr.WrapCounter));
+ if (counter->WrapCounter) {
+ bstrncpy(cr.WrapCounter, counter->WrapCounter->hdr.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(000, "Create counter %s val=%d\n", counter->hdr.name, counter->CurrentValue);
+ Dmsg2(100, "Create counter %s val=%d\n", counter->hdr.name, counter->CurrentValue);
}
- } else {
+ }
+ if (!counter->created) {
counter->CurrentValue = counter->MinValue; /* default value */
}
}