/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
The main author of Bacula is Kern Sibbald, with contributions from
many others, a complete list can be found in the file AUTHORS.
apply_pool_overrides(jcr);
- jcr->jr.PoolId = get_or_create_pool_record(jcr, jcr->pool->hdr.name);
+ jcr->jr.PoolId = get_or_create_pool_record(jcr, jcr->pool->name());
if (jcr->jr.PoolId == 0) {
return false;
}
set_jcr_job_status(jcr, JS_Running);
fd = jcr->file_bsock;
- if (!send_include_list(jcr)) {
+ if (!send_level_command(jcr)) {
goto bail_out;
}
- if (!send_exclude_list(jcr)) {
+ if (!send_runscripts_commands(jcr)) {
goto bail_out;
}
- if (!send_level_command(jcr)) {
+ if (!send_include_list(jcr)) {
+ goto bail_out;
+ }
+
+ if (!send_exclude_list(jcr)) {
goto bail_out;
}
goto bail_out;
}
- if (!send_runscripts_commands(jcr)) {
- goto bail_out;
- }
-
/*
* We re-update the job start record so that the start
* time is set after the run before job. This avoids
/* Pickup Job termination data */
stat = wait_for_job_termination(jcr);
+#ifdef HAVE_BATCH_FILE_INSERT
+ db_create_batch_file_record(jcr); /* used by bulk batch file insert */
+#endif
if (stat == JS_Terminated) {
backup_cleanup(jcr, stat);
return true;
utime_t RunTime;
Dmsg2(100, "Enter backup_cleanup %d %c\n", TermCode, TermCode);
- dequeue_messages(jcr); /* display any queued messages */
memset(&mr, 0, sizeof(mr));
memset(&cr, 0, sizeof(cr));
- set_jcr_job_status(jcr, TermCode);
- update_job_end_record(jcr); /* update database */
+ update_job_end(jcr, TermCode);
if (!db_get_job_record(jcr, jcr->db, &jcr->jr)) {
Jmsg(jcr, M_WARNING, 0, _("Error getting job record for stats: %s"),