*/
/*
- Copyright (C) 2000-2003 Kern Sibbald and John Walker
+ Copyright (C) 2000-2004 Kern Sibbald and John Walker
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
#include "ua.h"
-/* Forward referenced functions */
-static void admin_cleanup(JCR *jcr, int TermCode);
-
-/* External functions */
+bool do_admin_init(JCR *jcr)
+{
+ return true;
+}
-/*
- * Returns: 0 on failure
- * 1 on success
+/*
+ * Returns: false on failure
+ * true on success
*/
-int do_admin(JCR *jcr)
+bool do_admin(JCR *jcr)
{
jcr->jr.JobId = jcr->JobId;
- jcr->jr.StartTime = jcr->start_time;
- if (!db_update_job_start_record(jcr, jcr->db, &jcr->jr)) {
- Jmsg(jcr, M_ERROR, 0, "%s", db_strerror(jcr->db));
- goto bail_out;
- }
jcr->fname = (char *)get_pool_memory(PM_FNAME);
set_jcr_job_status(jcr, JS_Running);
admin_cleanup(jcr, JS_Terminated);
- return 0;
-
-bail_out:
- admin_cleanup(jcr, JS_ErrorTerminated);
- return 0;
+ return true;
}
+
/*
* Release resources allocated during backup.
*/
-static void admin_cleanup(JCR *jcr, int TermCode)
+void admin_cleanup(JCR *jcr, int TermCode)
{
char sdt[50], edt[50];
char term_code[100];
- char *term_msg;
+ const char *term_msg;
int msg_type;
MEDIA_DBR mr;
set_jcr_job_status(jcr, TermCode);
update_job_end_record(jcr); /* update database */
-
+
if (!db_get_job_record(jcr, jcr->db, &jcr->jr)) {
- Jmsg(jcr, M_WARNING, 0, _("Error getting job record for stats: %s"),
+ Jmsg(jcr, M_WARNING, 0, _("Error getting job record for stats: %s"),
db_strerror(jcr->db));
set_jcr_job_status(jcr, JS_ErrorTerminated);
}
msg_type = M_INFO; /* by default INFO message */
switch (jcr->JobStatus) {
- case JS_Terminated:
- term_msg = _("Admin OK");
- break;
- case JS_FatalError:
- case JS_ErrorTerminated:
- term_msg = _("*** Admin Error ***");
- msg_type = M_ERROR; /* Generate error message */
- break;
- case JS_Canceled:
- term_msg = _("Admin Canceled");
- break;
- default:
- term_msg = term_code;
- sprintf(term_code, _("Inappropriate term code: %c\n"), jcr->JobStatus);
- break;
+ case JS_Terminated:
+ term_msg = _("Admin OK");
+ break;
+ case JS_FatalError:
+ case JS_ErrorTerminated:
+ term_msg = _("*** Admin Error ***");
+ msg_type = M_ERROR; /* Generate error message */
+ break;
+ case JS_Canceled:
+ term_msg = _("Admin Canceled");
+ break;
+ default:
+ term_msg = term_code;
+ sprintf(term_code, _("Inappropriate term code: %c\n"), jcr->JobStatus);
+ break;
}
bstrftime(sdt, sizeof(sdt), jcr->jr.StartTime);
bstrftime(edt, sizeof(edt), jcr->jr.EndTime);
- Jmsg(jcr, msg_type, 0, _("Bacula " VERSION " (" LSMDATE "): %s\n\
-JobId: %d\n\
-Job: %s\n\
-Start time: %s\n\
-End time: %s\n\
-Termination: %s\n\n"),
+ Jmsg(jcr, msg_type, 0, _("Bacula " VERSION " (" LSMDATE "): %s\n"
+" JobId: %d\n"
+" Job: %s\n"
+" Start time: %s\n"
+" End time: %s\n"
+" Termination: %s\n\n"),
edt,
jcr->jr.JobId,
jcr->jr.Job,