BIND 10 master, updated. b5bbfb2f868f8f7401018debe275c39fc65a5139 [trac1077] Add liblog to list of libraries for linking to cache unit tests

BIND 10 source code commits bind10-changes at lists.isc.org
Thu Jul 7 15:28:00 UTC 2011 

The branch, master has been updated
       via  b5bbfb2f868f8f7401018debe275c39fc65a5139 (commit)
       via  710095383c263973fffe58b050a4924d5053bd7f (commit)
       via  dd356abbe83f7c1275eba42ac855977499e71e44 (commit)
       via  27c6b8cef44f5daaa149ec72e3b7052e516ebc26 (commit)
       via  846493567722add45db6e7296d570f8ecf99837e (commit)
       via  242235d6e7bb4e1893c0ebfc58e7a757dae771f8 (commit)
      from  c05781723ac006e4d193d9181bf46ccec998a5b0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b5bbfb2f868f8f7401018debe275c39fc65a5139
Author: Stephen Morris <stephen at isc.org>
Date:   Thu Jul 7 16:25:35 2011 +0100

    [trac1077] Add liblog to list of libraries for linking to cache unit tests

commit 710095383c263973fffe58b050a4924d5053bd7f
Merge: dd356abbe83f7c1275eba42ac855977499e71e44 c05781723ac006e4d193d9181bf46ccec998a5b0
Author: Stephen Morris <stephen at isc.org>
Date:   Thu Jul 7 15:41:11 2011 +0100

    Merge branch 'master' into trac1077

commit dd356abbe83f7c1275eba42ac855977499e71e44
Author: Stephen Morris <stephen at isc.org>
Date:   Thu Jul 7 15:32:29 2011 +0100

    [trac1077] Minor changes to message text after review
    
    The .h and .cc files have been updated to keep the creation dates
    in them in step with the change to the message file.

commit 27c6b8cef44f5daaa149ec72e3b7052e516ebc26
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Wed Jul 6 08:50:32 2011 -0500

    [trac1077] add space between "BIND 10"
    
    Where is the style guide for .mes messages files?

commit 846493567722add45db6e7296d570f8ecf99837e
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Wed Jul 6 07:59:02 2011 -0500

    [trac1077] typo and punctuation fix

commit 242235d6e7bb4e1893c0ebfc58e7a757dae771f8
Author: Stephen Morris <stephen at isc.org>
Date:   Tue Jul 5 18:25:13 2011 +0100

    [trac1077] Changes to description
    
    .cc and .h files regenerated to ensure .cc and .h files are up to
    date with the .mes file.

-----------------------------------------------------------------------

Summary of changes:
 src/lib/cache/tests/Makefile.am |    1 +
 src/lib/log/log_messages.cc     |    2 +-
 src/lib/log/log_messages.h      |    2 +-
 src/lib/log/log_messages.mes    |   32 ++++++++++++++++----------------
 4 files changed, 19 insertions(+), 18 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/cache/tests/Makefile.am b/src/lib/cache/tests/Makefile.am
index 39215d9..f9237af 100644
--- a/src/lib/cache/tests/Makefile.am
+++ b/src/lib/cache/tests/Makefile.am
@@ -53,6 +53,7 @@ run_unittests_LDADD += -lboost_thread
 endif
 
 run_unittests_LDADD += $(top_builddir)/src/lib/cache/libcache.la
+run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
 run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la
 run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la
 run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
diff --git a/src/lib/log/log_messages.cc b/src/lib/log/log_messages.cc
index a515959..f60898c 100644
--- a/src/lib/log/log_messages.cc
+++ b/src/lib/log/log_messages.cc
@@ -1,4 +1,4 @@
-// File created from log_messages.mes on Wed Jun 22 11:54:57 2011
+// File created from log_messages.mes on Thu Jul  7 15:32:06 2011
 
 #include <cstddef>
 #include <log/message_types.h>
diff --git a/src/lib/log/log_messages.h b/src/lib/log/log_messages.h
index 476f686..10e1501 100644
--- a/src/lib/log/log_messages.h
+++ b/src/lib/log/log_messages.h
@@ -1,4 +1,4 @@
-// File created from log_messages.mes on Wed Jun 22 11:54:57 2011
+// File created from log_messages.mes on Thu Jul  7 15:32:06 2011
 
 #ifndef __LOG_MESSAGES_H
 #define __LOG_MESSAGES_H
diff --git a/src/lib/log/log_messages.mes b/src/lib/log/log_messages.mes
index 697ac92..f150f39 100644
--- a/src/lib/log/log_messages.mes
+++ b/src/lib/log/log_messages.mes
@@ -28,23 +28,23 @@ destination should be one of "console", "file", or "syslog".
 
 % LOG_BAD_SEVERITY unrecognized log severity: %1
 A logger severity value was given that was not recognized. The severity
-should be one of "DEBUG", "INFO", "WARN", "ERROR", or "FATAL".
+should be one of "DEBUG", "INFO", "WARN", "ERROR", "FATAL" or "NONE".
 
 % LOG_BAD_STREAM bad log console output stream: %1
-A log console output stream was given that was not recognized. The output
-stream should be one of "stdout", or "stderr"
+Logging has been configured so that output is written to the terminal
+(console) but the stream on which it is to be written is not recognised.
+Allowed values are "stdout" and "stderr".
 
 % LOG_DUPLICATE_MESSAGE_ID duplicate message ID (%1) in compiled code
-During start-up, BIND10 detected that the given message identification had
-been defined multiple times in the BIND10 code.
-
-This has no ill-effects other than the possibility that an erronous
-message may be logged.  However, as it is indicative of a programming
-error, please log a bug report.
+During start-up, BIND 10 detected that the given message identification
+had been defined multiple times in the BIND 10 code.  This indicates a
+programming error; please submit a bug report.
 
 % LOG_DUPLICATE_NAMESPACE line %1: duplicate $NAMESPACE directive found
 When reading a message file, more than one $NAMESPACE directive was found.
-Such a condition is regarded as an error and the read will be abandoned.
+(This directive is used to set a C++ namespace when generating header
+files during software development.)  Such a condition is regarded as an
+error and the read will be abandoned.
 
 % LOG_INPUT_OPEN_FAIL unable to open message file %1 for input: %2
 The program was not able to open the specified input message file for
@@ -99,10 +99,10 @@ There may be several reasons why this message may appear:
 - The program outputting the message may not use that particular message
 (e.g. it originates in a module not used by the program.)
 
-- The local file was written for an earlier version of the BIND10 software
+- The local file was written for an earlier version of the BIND 10 software
 and the later version no longer generates that message.
 
-Whatever the reason, there is no impact on the operation of BIND10.
+Whatever the reason, there is no impact on the operation of BIND 10.
 
 % LOG_OPEN_OUTPUT_FAIL unable to open %1 for output: %2
 Originating within the logging code, the program was not able to open
@@ -115,7 +115,7 @@ This error is generated when the compiler finds a $PREFIX directive with
 more than one argument.
 
 Note: the $PREFIX directive is deprecated and will be removed in a future
-version of BIND10.
+version of BIND 10.
 
 % LOG_PREFIX_INVALID_ARG line %1: $PREFIX directive has an invalid argument ('%2')
 Within a message file, the $PREFIX directive takes a single argument,
@@ -123,13 +123,13 @@ a prefix to be added to the symbol names when a C++ file is created.
 As such, it must adhere to restrictions on C++ symbol names (e.g. may
 only contain alphanumeric characters or underscores, and may nor start
 with a digit).  A $PREFIX directive was found with an argument (given
-in the message) that violates those restictions.
+in the message) that violates those restrictions.
 
 Note: the $PREFIX directive is deprecated and will be removed in a future
-version of BIND10.
+version of BIND 10.
 
 % LOG_READING_LOCAL_FILE reading local message file %1
-This is an informational message output by BIND10 when it starts to read
+This is an informational message output by BIND 10 when it starts to read
 a local message file.  (A local message file may replace the text of
 one of more messages; the ID of the message will not be changed though.)

More information about the bind10-changes mailing list