From 7acc35832167a6e30b6aa5e5d6f5cb8c1064a554 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 17 Feb 2008 12:30:05 +0000 Subject: [PATCH] Plugin debug code + tweak a couple bat dialog layouts git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6436 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/dird/dird_conf.c | 5 +- bacula/src/lib/plugins.c | 3 +- bacula/src/qt-console/prefs.ui | 273 ++++++++++++++++++----- bacula/src/qt-console/restore/restore.ui | 95 +++++--- bacula/technotes-2.3 | 2 + 5 files changed, 280 insertions(+), 98 deletions(-) diff --git a/bacula/src/dird/dird_conf.c b/bacula/src/dird/dird_conf.c index e31f5c718c..b9d5ab1591 100644 --- a/bacula/src/dird/dird_conf.c +++ b/bacula/src/dird/dird_conf.c @@ -620,7 +620,7 @@ void dump_resource(int type, RES *reshdr, void sendit(void *sock, const char *fm sendit(sock, _(" SpoolSize=%s\n"), edit_uint64(res->res_job.spool_size, ed1)); } if (res->res_job.JobType == JT_BACKUP) { - sendit(sock, _(" Accurate=%d\n"), res->res_job.accurate); + sendit(sock, _(" Accurate=%d\n"), res->res_job.accurate); } if (res->res_job.JobType == JT_MIGRATE) { sendit(sock, _(" SelectionType=%d\n"), res->res_job.selection_type); @@ -1015,6 +1015,9 @@ void free_resource(RES *sres, int type) if (res->res_dir.scripts_directory) { free((char *)res->res_dir.scripts_directory); } + if (res->res_dir.plugin_directory) { + free((char *)res->res_dir.plugin_directory); + } if (res->res_dir.pid_directory) { free(res->res_dir.pid_directory); } diff --git a/bacula/src/lib/plugins.c b/bacula/src/lib/plugins.c index 1e55091652..aa29ed97a5 100644 --- a/bacula/src/lib/plugins.c +++ b/bacula/src/lib/plugins.c @@ -90,7 +90,7 @@ bool load_plugins(void *binfo, void *bfuncs, const char *plugin_dir, const char for ( ;; ) { if ((readdir_r(dp, entry, &result) != 0) || (result == NULL)) { if (!found) { - Jmsg(NULL, M_INFO, 0, _("Failed to find suitable plugin in %s\n"), + Jmsg(NULL, M_INFO, 0, _("Failed to find any plugins in %s\n"), plugin_dir); } break; @@ -103,6 +103,7 @@ bool load_plugins(void *binfo, void *bfuncs, const char *plugin_dir, const char len = strlen(result->d_name); type_len = strlen(type); if (len < type_len+1 || strcmp(&result->d_name[len-type_len], type) != 0) { + Dmsg3(100, "Rejected plugin: want=%s name=%s len=%d\n", type, result->d_name, len); continue; } Dmsg2(100, "Loaded plugin: name=%s len=%d\n", result->d_name, len); diff --git a/bacula/src/qt-console/prefs.ui b/bacula/src/qt-console/prefs.ui index 0079fd3e97..4be2ab5709 100644 --- a/bacula/src/qt-console/prefs.ui +++ b/bacula/src/qt-console/prefs.ui @@ -5,14 +5,12 @@ 0 0 - 360 - 485 + 435 + 499 - - 0 - 0 + 0 0 @@ -24,34 +22,56 @@ images/bat.png - + 9 - + + 9 + + + 9 + + + 9 + + + 6 + + 6 - 2 + 4 Messages - + 9 - + + 9 + + + 9 + + + 9 + + + 6 + + 6 - - 5 - 0 + 0 0 @@ -60,10 +80,22 @@ Messages Options - + 9 - + + 9 + + + 9 + + + 9 + + + 6 + + 6 @@ -97,18 +129,28 @@ Joblist - + 9 - + + 9 + + + 9 + + + 9 + + + 6 + + 6 - - 5 - 0 + 0 0 @@ -117,18 +159,42 @@ Jolist Limit Options - + 9 - + + 9 + + + 9 + + + 9 + + + 6 + + 6 - + 0 - + + 0 + + + 0 + + + 0 + + + 6 + + 6 @@ -140,12 +206,12 @@ - - 10000 - 1 + + 10000 + 7 @@ -153,12 +219,12 @@ - - 10000 - 1 + + 10000 + 25 @@ -187,7 +253,7 @@ 30 220 - 271 + 311 111 @@ -239,18 +305,30 @@ 30 10 - 190 - 55 + 311 + 61 Context Sensitive List Commands - + + 9 + + + 9 + + + 9 + + 9 - + + 6 + + 6 @@ -267,7 +345,7 @@ 30 80 - 271 + 311 121 @@ -320,18 +398,28 @@ Debug - + + 9 + + + 9 + + + 9 + + 9 - + + 6 + + 6 - - 5 - 0 + 0 0 @@ -340,18 +428,42 @@ Debugging Options - + + 9 + + + 9 + + + 9 + + 9 - + + 6 + + 6 - + + 0 + + + 0 + + + 0 + + 0 - + + 6 + + 6 @@ -401,18 +513,28 @@ RestoreTree - + + 9 + + 9 - + + 9 + + + 9 + + + 6 + + 6 - - 5 - 0 + 0 0 @@ -421,18 +543,42 @@ Debugging Options - + + 9 + + + 9 + + + 9 + + 9 - + + 6 + + 6 - + + 0 + + 0 - + + 0 + + + 0 + + + 6 + + 6 @@ -540,12 +686,21 @@ - - 0 - 6 + + 0 + + + 0 + + + 0 + + + 0 + @@ -562,9 +717,7 @@ - - 5 - 0 + 0 0 diff --git a/bacula/src/qt-console/restore/restore.ui b/bacula/src/qt-console/restore/restore.ui index 0429324889..6d6d14e253 100644 --- a/bacula/src/qt-console/restore/restore.ui +++ b/bacula/src/qt-console/restore/restore.ui @@ -13,10 +13,22 @@ Form - + 9 - + + 9 + + + 9 + + + 9 + + + 6 + + 6 @@ -26,9 +38,7 @@ - - 5 - 7 + 1 1 @@ -71,9 +81,7 @@ - - 7 - 5 + 144 1 @@ -145,12 +153,21 @@ - - 0 - 6 + + 0 + + + 0 + + + 0 + + + 0 + @@ -195,7 +212,7 @@ 16777215 - 15 + 41 @@ -222,9 +239,7 @@ - - 5 - 0 + 0 0 @@ -246,9 +261,7 @@ - - 5 - 0 + 0 0 @@ -270,9 +283,7 @@ - - 5 - 0 + 0 0 @@ -331,18 +342,25 @@ - - 0 - 6 + + 0 + + + 0 + + + 0 + + + 0 + - - 0 - 0 + 0 0 @@ -355,9 +373,7 @@ - - 5 - 0 + 0 0 @@ -371,18 +387,25 @@ - - 0 - 6 + + 0 + + + 0 + + + 0 + + + 0 + - - 0 - 5 + 0 0 diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3 index bc9d0987b2..f5a2d06801 100644 --- a/bacula/technotes-2.3 +++ b/bacula/technotes-2.3 @@ -1,6 +1,8 @@ Technical notes on version 2.3 General: +17Feb08 +kes Plugin debug code + tweak a couple bat dialog layouts 14Feb08 kes Fix creating first JobMedia record during Migration to include proper index. This caused slow restores of migrated jobs. -- 2.39.5