From 544721bcea6c949740c1b1cb46f8d1d20a7bdf15 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Sun, 24 Oct 2010 16:01:00 +0200 Subject: [PATCH] Remove extra EndTime displayed on the first line of the Job status report Most of the time, EndTime is displayed at the begining of the line, and it's also a Field present in the status. 24-oct. 15:53 zog4-dir JobId 6: Bacula zog4-dir 4.1.9 (18Sep10): 24-oct.-2010 15:53:49 -> 24-oct. 15:53 zog4-dir JobId 6: Bacula zog4-dir 4.1.9 (18Sep10): --- bacula/src/dird/backup.c | 4 ++-- bacula/src/dird/migrate.c | 4 ++-- bacula/src/dird/restore.c | 4 ++-- bacula/src/dird/vbackup.c | 4 ++-- bacula/src/dird/verify.c | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c index c71577913a..746346abfb 100644 --- a/bacula/src/dird/backup.c +++ b/bacula/src/dird/backup.c @@ -705,7 +705,7 @@ void backup_cleanup(JCR *jcr, int TermCode) } // bmicrosleep(15, 0); /* for debugging SIGHUP */ - Jmsg(jcr, msg_type, 0, _("%s %s %s (%s): %s\n" + Jmsg(jcr, msg_type, 0, _("%s %s %s (%s):\n" " Build OS: %s %s %s\n" " JobId: %d\n" " Job: %s\n" @@ -739,7 +739,7 @@ void backup_cleanup(JCR *jcr, int TermCode) " FD termination status: %s\n" " SD termination status: %s\n" " Termination: %s\n\n"), - BACULA, my_name, VERSION, LSMDATE, edt, + BACULA, my_name, VERSION, LSMDATE, HOST_OS, DISTNAME, DISTVER, jcr->jr.JobId, jcr->jr.Job, diff --git a/bacula/src/dird/migrate.c b/bacula/src/dird/migrate.c index 27ad39c37f..357250b334 100644 --- a/bacula/src/dird/migrate.c +++ b/bacula/src/dird/migrate.c @@ -1290,7 +1290,7 @@ void migration_cleanup(JCR *jcr, int TermCode) jobstatus_to_ascii(jcr->SDJobStatus, sd_term_msg, sizeof(sd_term_msg)); - Jmsg(jcr, msg_type, 0, _("%s %s %s (%s): %s\n" + Jmsg(jcr, msg_type, 0, _("%s %s %s (%s):\n" " Build OS: %s %s %s\n" " Prev Backup JobId: %s\n" " Prev Backup Job: %s\n" @@ -1319,7 +1319,7 @@ void migration_cleanup(JCR *jcr, int TermCode) " SD Errors: %d\n" " SD termination status: %s\n" " Termination: %s\n\n"), - BACULA, my_name, VERSION, LSMDATE, edt, + BACULA, my_name, VERSION, LSMDATE, HOST_OS, DISTNAME, DISTVER, edit_uint64(jcr->previous_jr.JobId, ec6), jcr->previous_jr.Job, diff --git a/bacula/src/dird/restore.c b/bacula/src/dird/restore.c index 6940ef6a5c..a5cce8511d 100644 --- a/bacula/src/dird/restore.c +++ b/bacula/src/dird/restore.c @@ -606,7 +606,7 @@ void restore_cleanup(JCR *jcr, int TermCode) jobstatus_to_ascii(jcr->FDJobStatus, fd_term_msg, sizeof(fd_term_msg)); jobstatus_to_ascii(jcr->SDJobStatus, sd_term_msg, sizeof(sd_term_msg)); - Jmsg(jcr, msg_type, 0, _("%s %s %s (%s): %s\n" + Jmsg(jcr, msg_type, 0, _("%s %s %s (%s):\n" " Build OS: %s %s %s\n" " JobId: %d\n" " Job: %s\n" @@ -621,7 +621,7 @@ void restore_cleanup(JCR *jcr, int TermCode) " FD termination status: %s\n" " SD termination status: %s\n" " Termination: %s\n\n"), - BACULA, my_name, VERSION, LSMDATE, edt, + BACULA, my_name, VERSION, LSMDATE, HOST_OS, DISTNAME, DISTVER, jcr->jr.JobId, jcr->jr.Job, diff --git a/bacula/src/dird/vbackup.c b/bacula/src/dird/vbackup.c index 86983cf41f..632c416f06 100644 --- a/bacula/src/dird/vbackup.c +++ b/bacula/src/dird/vbackup.c @@ -387,7 +387,7 @@ void vbackup_cleanup(JCR *jcr, int TermCode) } jobstatus_to_ascii(jcr->SDJobStatus, sd_term_msg, sizeof(sd_term_msg)); - Jmsg(jcr, msg_type, 0, _("%s %s %s (%s): %s\n" + Jmsg(jcr, msg_type, 0, _("%s %s %s (%s):\n" " Build OS: %s %s %s\n" " JobId: %d\n" " Job: %s\n" @@ -412,7 +412,7 @@ void vbackup_cleanup(JCR *jcr, int TermCode) " SD Errors: %d\n" " SD termination status: %s\n" " Termination: %s\n\n"), - BACULA, my_name, VERSION, LSMDATE, edt, + BACULA, my_name, VERSION, LSMDATE, HOST_OS, DISTNAME, DISTVER, jcr->jr.JobId, jcr->jr.Job, diff --git a/bacula/src/dird/verify.c b/bacula/src/dird/verify.c index 92b29edd81..2e4ecbc450 100644 --- a/bacula/src/dird/verify.c +++ b/bacula/src/dird/verify.c @@ -454,7 +454,7 @@ void verify_cleanup(JCR *jcr, int TermCode) jobstatus_to_ascii(jcr->FDJobStatus, fd_term_msg, sizeof(fd_term_msg)); if (jcr->getJobLevel() == L_VERIFY_VOLUME_TO_CATALOG) { jobstatus_to_ascii(jcr->SDJobStatus, sd_term_msg, sizeof(sd_term_msg)); - Jmsg(jcr, msg_type, 0, _("%s %s %s (%s): %s\n" + Jmsg(jcr, msg_type, 0, _("%s %s %s (%s):\n" " Build OS: %s %s %s\n" " JobId: %d\n" " Job: %s\n" @@ -471,7 +471,7 @@ void verify_cleanup(JCR *jcr, int TermCode) " FD termination status: %s\n" " SD termination status: %s\n" " Termination: %s\n\n"), - BACULA, my_name, VERSION, LSMDATE, edt, + BACULA, my_name, VERSION, LSMDATE, HOST_OS, DISTNAME, DISTVER, jcr->jr.JobId, jcr->jr.Job, @@ -489,7 +489,7 @@ void verify_cleanup(JCR *jcr, int TermCode) sd_term_msg, term_msg); } else { - Jmsg(jcr, msg_type, 0, _("%s %s %s (%s): %s\n" + Jmsg(jcr, msg_type, 0, _("%s %s %s (%s):\n" " Build: %s %s %s\n" " JobId: %d\n" " Job: %s\n" @@ -504,7 +504,7 @@ void verify_cleanup(JCR *jcr, int TermCode) " Non-fatal FD errors: %d\n" " FD termination status: %s\n" " Termination: %s\n\n"), - BACULA, my_name, VERSION, LSMDATE, edt, + BACULA, my_name, VERSION, LSMDATE, HOST_OS, DISTNAME, DISTVER, jcr->jr.JobId, jcr->jr.Job, -- 2.39.5