From: Kern Sibbald Date: Sun, 8 May 2005 17:06:57 +0000 (+0000) Subject: - Add Client OS type to Job report. X-Git-Tag: Release-1.38.0~484 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f0a3e937e7760524bd5df74a0fda925bf2676d74;p=bacula%2Fbacula - Add Client OS type to Job report. - Add version to manual - Update the Web site to have a single page for the documentation links. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2014 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/ChangeLog b/bacula/ChangeLog index 0964c0bfe0..650c181fb1 100644 --- a/bacula/ChangeLog +++ b/bacula/ChangeLog @@ -1,3 +1,31 @@ +Changes to 1.37.18 release 08May05: +08May05 +- Correct attribute definition compile error in 1.37.17 +- Correct inverted order of CreateTime and MD5 pointed out + by a user in a bug report in FileSet db routine causing + the MD5 to print in the output instead of the time/date. + +Changes to 1.37.17: +07May05 +- Implement cstrlen() in sql list routines. +- Implement caching of attributes to add the + signature so that only one DB call will be made + per file. Not yet turned on. +- Fix Win32 build for TLS. +- Optimize File pruning to eliminate one database call. +- Fix bug that prevented File pruning from working. +- Implement a cstrlen() which returns the character + length of a UTF-8 string. +06May05 +- Move test for MaxStartDelay as suggested by Peter. +- Implement Python methods (I had to read the Python source + code). +- Implement run() method in Director. +- Add Priority and Scheduled time to Job report. +- Add JobInit and JobRun events. +- Add Priority as Python read/write attribute to Job. +- Correct typo in bsmtp reported by Jo. + Changes to 1.37.16 (07May05): released 07May05 07May05 - Implement cstrlen() in sql list routines. diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes index dbdfb9a219..79a92c1dcd 100644 --- a/bacula/ReleaseNotes +++ b/bacula/ReleaseNotes @@ -1,5 +1,5 @@ - Release Notes for Bacula 1.37.16 + Release Notes for Bacula 1.37.18 Bacula code: Total files = 425 Total lines = 137,071 (*.h *.c *.in) diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index b90f00647a..2bd0309e32 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -234,11 +234,11 @@ if test x$support_wx_console = xyes; then if test $pkg = 0; then WXRELEASE=`$WXCONFIG --release` if test $WXRELEASE = 2.6; then - WXCONS_CPPFLAGS=`$WXCONFIG --cppflags --unicode=no` - WXCONS_LDFLAGS=`$WXCONFIG --libs --unicode=no` + WXCONS_CPPFLAGS=`$WXCONFIG --cppflags --unicode=no` + WXCONS_LDFLAGS=`$WXCONFIG --libs --unicode=no` else - WXCONS_CPPFLAGS=`$WXCONFIG --cppflags` - WXCONS_LDFLAGS=`$WXCONFIG --libs` + WXCONS_CPPFLAGS=`$WXCONFIG --cppflags` + WXCONS_LDFLAGS=`$WXCONFIG --libs` fi AC_SUBST(WXCONS_CPPFLAGS) @@ -1895,6 +1895,7 @@ AC_OUTPUT([autoconf/Make.common \ scripts/logwatch/Makefile \ scripts/logwatch/logfile.bacula.conf \ doc/Makefile \ + doc/latex/version.tex \ src/Makefile \ src/host.h \ src/console/Makefile \ diff --git a/bacula/configure b/bacula/configure index 88b3977366..7125a51d9c 100755 --- a/bacula/configure +++ b/bacula/configure @@ -5176,11 +5176,11 @@ if test x$support_wx_console = xyes; then if test $pkg = 0; then WXRELEASE=`$WXCONFIG --release` if test $WXRELEASE = 2.6; then - WXCONS_CPPFLAGS=`$WXCONFIG --cppflags --unicode=no` - WXCONS_LDFLAGS=`$WXCONFIG --libs --unicode=no` + WXCONS_CPPFLAGS=`$WXCONFIG --cppflags --unicode=no` + WXCONS_LDFLAGS=`$WXCONFIG --libs --unicode=no` else - WXCONS_CPPFLAGS=`$WXCONFIG --cppflags` - WXCONS_LDFLAGS=`$WXCONFIG --libs` + WXCONS_CPPFLAGS=`$WXCONFIG --cppflags` + WXCONS_LDFLAGS=`$WXCONFIG --libs` fi @@ -21533,7 +21533,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then exit 1 fi - ac_config_files="$ac_config_files autoconf/Make.common Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/gnome-console.console_apps scripts/mtx-changer scripts/dvd-writepart scripts/dvd-freespace scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf doc/Makefile src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome-console/Makefile src/gnome-console/gnome-console.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/wx-console/Makefile src/wx-console/wx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/filed/win32/Makefile src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/win32/winbacula.nsi src/win32/baculafd/bacula-fd.conf src/win32/Makefile src/win32/console/bconsole.conf src/win32/wx-console/wx-console.conf src/win32/pebuilder/Makefile src/bimagemgr/Makefile src/bimagemgr/bacula-bimagemgr.spec $PFILES" + ac_config_files="$ac_config_files autoconf/Make.common Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/gnome-console.console_apps scripts/mtx-changer scripts/dvd-writepart scripts/dvd-freespace scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf doc/Makefile doc/latex/version.tex src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome-console/Makefile src/gnome-console/gnome-console.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/wx-console/Makefile src/wx-console/wx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/filed/win32/Makefile src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/create_sqlite3_database src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile src/win32/winbacula.nsi src/win32/baculafd/bacula-fd.conf src/win32/Makefile src/win32/console/bconsole.conf src/win32/wx-console/wx-console.conf src/win32/pebuilder/Makefile src/bimagemgr/Makefile src/bimagemgr/bacula-bimagemgr.spec $PFILES" ac_config_commands="$ac_config_commands default" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -22090,6 +22090,7 @@ do "scripts/logwatch/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/logwatch/Makefile" ;; "scripts/logwatch/logfile.bacula.conf" ) CONFIG_FILES="$CONFIG_FILES scripts/logwatch/logfile.bacula.conf" ;; "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; + "doc/latex/version.tex" ) CONFIG_FILES="$CONFIG_FILES doc/latex/version.tex" ;; "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/host.h" ) CONFIG_FILES="$CONFIG_FILES src/host.h" ;; "src/console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/console/Makefile" ;; diff --git a/bacula/src/cats/sql_get.c b/bacula/src/cats/sql_get.c index 4897538f5a..856ae1cf48 100644 --- a/bacula/src/cats/sql_get.c +++ b/bacula/src/cats/sql_get.c @@ -640,7 +640,7 @@ int db_get_client_record(JCR *jcr, B_DB *mdb, CLIENT_DBR *cdbr) } else { cdbr->ClientId = str_to_int64(row[0]); bstrncpy(cdbr->Name, row[1]!=NULL?row[1]:"", sizeof(cdbr->Name)); - bstrncpy(cdbr->Uname, row[2]!=NULL?row[1]:"", sizeof(cdbr->Uname)); + bstrncpy(cdbr->Uname, row[2]!=NULL?row[2]:"", sizeof(cdbr->Uname)); cdbr->AutoPrune = str_to_int64(row[3]); cdbr->FileRetention = str_to_int64(row[4]); cdbr->JobRetention = str_to_int64(row[5]); diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c index 39f9ce56d5..6bf16f6edb 100644 --- a/bacula/src/dird/backup.c +++ b/bacula/src/dird/backup.c @@ -326,12 +326,14 @@ void backup_cleanup(JCR *jcr, int TermCode) const char *term_msg; int msg_type; MEDIA_DBR mr; + CLIENT_DBR cr; double kbps, compression; 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 */ @@ -342,6 +344,12 @@ void backup_cleanup(JCR *jcr, int TermCode) set_jcr_job_status(jcr, JS_ErrorTerminated); } + bstrncpy(cr.Name, jcr->client->hdr.name, sizeof(cr.Name)); + if (!db_get_client_record(jcr, jcr->db, &cr)) { + Jmsg(jcr, M_WARNING, 0, _("Error getting client record for stats: %s"), + db_strerror(jcr->db)); + } + bstrncpy(mr.VolumeName, jcr->VolumeName, sizeof(mr.VolumeName)); if (!db_get_media_record(jcr, jcr->db, &mr)) { Jmsg(jcr, M_WARNING, 0, _("Error getting Media record for Volume \"%s\": ERR=%s"), @@ -483,7 +491,7 @@ void backup_cleanup(JCR *jcr, int TermCode) " JobId: %d\n" " Job: %s\n" " Backup Level: %s%s\n" -" Client: %s\n" +" Client: \"%s\" %s\n" " FileSet: \"%s\" %s\n" " Pool: \"%s\"\n" " Storage: \"%s\"\n" @@ -510,7 +518,7 @@ void backup_cleanup(JCR *jcr, int TermCode) jcr->jr.JobId, jcr->jr.Job, level_to_str(jcr->JobLevel), jcr->since, - jcr->client->hdr.name, + jcr->client->hdr.name, cr.Uname, jcr->fileset->hdr.name, jcr->FSCreateTime, jcr->pool->hdr.name, jcr->store->hdr.name, diff --git a/bacula/src/version.h b/bacula/src/version.h index 7dfb777401..06a270af30 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -12,7 +12,7 @@ #define TRACE_FILE 1 /* If this is set stdout will not be closed on startup */ -/* #define DEVELOPER 1 */ +#define DEVELOPER 1