09Oct07

kes  Add JobId in place of Job name in all the Jmsg() output.
kes  Correct the APP_DESC for the Win32 storage service (remove an e).

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@5739 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index be9548e82694be76e6aae3f3841352f7b3e28161..dd0a96d70d756c8528e33c628622500bb798598b 100644 (file)
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -1,5 +1,5 @@
 
-          Release Notes for Bacula 2.2.4 
+          Release Notes for Bacula 2.2.5 
 
   Bacula code: Total files = 520 Total lines = 195,550 (*.h *.c *.in)
   82 new files, 41,221 new lines of code, 208,380 lines of change from 2.0.3
@@ -10,6 +10,13 @@ use some of the new features that affect the FD.  In other words, you should
 not have to upgrade all your File daemons when you upgrade. There is
 no database upgrade needed from version 2.0.x to 2.2.0.
 
+Version 2.2.5 is a major bug fix release to version 2.2.4 
+- It fixes the following bugs: #961, 962, 963, 969, 968, 960,
+  964, (possibly 935 and 903), 953, 953, 967, 966, 965, 954, 
+  957, 908, 958, and 955.
+- It also improves listing performance problems in bat pointed
+  out by Chris Howells.
+
 Version 2.2.4 is a minor bug fix release to version 2.2.3
 - Possible fix for authorization problems bug #953.
 - Possible fix for bug #908.

diff --git a/bacula/src/lib/message.c b/bacula/src/lib/message.c
index 00ec1e97b6b0ff14a4f44c840be1738b47af629d..0c8253ce675ff09a938f1d9a1c1b7da0ae91d547 100644 (file)
--- a/bacula/src/lib/message.c
+++ b/bacula/src/lib/message.c
@@ -1076,7 +1076,7 @@ Jmsg(JCR *jcr, int type, time_t mtime, const char *fmt,...)
     va_list   arg_ptr;
     int len;
     MSGS *msgs;
-    const char *job;
+    uint32_t JobId = 0;
 
 
     Dmsg1(850, "Enter Jmsg type=%d\n", type);
@@ -1096,13 +1096,12 @@ Jmsg(JCR *jcr, int type, time_t mtime, const char *fmt,...)
     }
 
     msgs = NULL;
-    job = NULL;
     if (!jcr) {
        jcr = get_jcr_from_tsd();
     }
     if (jcr) {
        msgs = jcr->jcr_msgs;
-       job = jcr->Job;
+       JobId = jcr->JobId;
     }
     if (!msgs) {
        msgs = daemon_msgs;            /* if no jcr, we use daemon handler */
@@ -1127,25 +1126,26 @@ Jmsg(JCR *jcr, int type, time_t mtime, const char *fmt,...)
        len = bsnprintf(rbuf, sizeof(rbuf), _("%s ERROR TERMINATION\n"), my_name);
        break;
     case M_FATAL:
-       len = bsnprintf(rbuf, sizeof(rbuf), _("%s: %s Fatal error: "), my_name, job);
+       len = bsnprintf(rbuf, sizeof(rbuf), _("%s JobId %u: Fatal error: "), my_name, JobId);
        if (jcr) {
           set_jcr_job_status(jcr, JS_FatalError);
        }
        break;
     case M_ERROR:
-       len = bsnprintf(rbuf, sizeof(rbuf), _("%s: %s Error: "), my_name, job);
+       len = bsnprintf(rbuf, sizeof(rbuf), _("%s JobId %u: Error: "), my_name, JobId);
        if (jcr) {
           jcr->Errors++;
        }
        break;
     case M_WARNING:
-       len = bsnprintf(rbuf, sizeof(rbuf), _("%s: %s Warning: "), my_name, job);
+       len = bsnprintf(rbuf, sizeof(rbuf), _("%s JobId %u: Warning: "), my_name, JobId);
        break;
     case M_SECURITY:
-       len = bsnprintf(rbuf, sizeof(rbuf), _("%s: %s Security violation: "), my_name, job);
+       len = bsnprintf(rbuf, sizeof(rbuf), _("%s JobId %u: Security violation: "),
+                my_name, JobId);
        break;
     default:
-       len = bsnprintf(rbuf, sizeof(rbuf), "%s: ", my_name);
+       len = bsnprintf(rbuf, sizeof(rbuf), "%s JobId %u: ", my_name, JobId);
        break;
     }
 

diff --git a/bacula/src/win32/stored/who.h b/bacula/src/win32/stored/who.h
index 910d00d5fcfd93e276a913c464484aeada990226..999347d5180d5374dae4f755e1ab87e472e20236 100644 (file)
--- a/bacula/src/win32/stored/who.h
+++ b/bacula/src/win32/stored/who.h
@@ -36,7 +36,7 @@
 
 #define APP_NAME "Bacula-sd"
 #define LC_APP_NAME "bacula-sd"
-#define APP_DESC "Bacula Storagee Service"
+#define APP_DESC "Bacula Storage Service"
 
 #define terminate_app(x) terminate_stored(x)
 extern void terminate_stored(int sig);

diff --git a/bacula/technotes-2.1 b/bacula/technotes-2.1
index 4c8e8c5b5e82802a969c5be37eaabd57c30f3d01..78363a0c2399abf087fdf35a7e3e3d9704bfc97c 100644 (file)
--- a/bacula/technotes-2.1
+++ b/bacula/technotes-2.1
@@ -1,9 +1,12 @@
               Technical notes on version 2.2
 
 General:
-kes  Add new SD despooling attributes and Dir inserting attributes 
-     job status codes.  This fixes bug 961.
+09Oct07
+kes  Add JobId in place of Job name in all the Jmsg() output.  
+kes  Correct the APP_DESC for the Win32 storage service (remove an e).
 06Oct07
+kes  Add new SD despooling attributes and Dir inserting attributes 
+     job status codes.  This fixes bug #961.
 kes  Fix Win32 drive display in bat version browser. Fixes bug #962.
 05Oct07
 kes  Fix doc issue. This fixes bug #963.
@@ -36,10 +39,6 @@ dvl  Add new configuration item --archivedir
 dvl  Adjust regression tests to use tmp not /tmp.  This will allow
      multiple concurrent runs of the regression tests.
 28Sep07
-kes  Fix race condition that drops final block written to volume.
-     This happens in rare cases with multiple simultaneous jobs 
-     when the Volume fills.  This fixes bug #964.  May be related
-     to bug #935 and possibly #903.
 kes  Eliminate more strerror() and replace with bstrerror().
 kes  Remove BSD getopt and replace with unrestricted IBM version.
 kes  Fix Win32 build for changed calling sequences.