[#1945] address review

- generate kea-messages.rst automatically on make -C doc/sphinx
- add disclaimer header that debug-messages.rst and kea-messages.rst are
  generated
- minor changes to debug level variable names
- do not write section "Messages printed" in tools/check-messages.py if
  there are no messages

diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index e0866a987fbf75432bb75f4076ec4d321785453c..9b4206319ecf1dfdb52002c5af3855b645ec9216 100644 (file)
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -61,9 +61,9 @@ api_files =
 include $(top_srcdir)/src/share/api/api_files.mk
 
 if HAVE_PDFLATEX
-all: html mans pdf text
+all: kea-messages.rst html mans pdf text
 else
-all: html mans text
+all: kea-messages.rst html mans text
 endif
 
 # build the list of message files
@@ -73,8 +73,7 @@ mes_files.mk: mes-files.txt
 mes-files.txt:
        @find ../.. -type f -name '*.mes' | sort -V | sed 's#^../../##g' > $@
 
-# this rule is only used for development purposes and is not used in official
-# build process as kea-messages.rst is always generated via sphinx's conf.py
+# Used in official build process. kea-messages.rst is generated via mes2doc.py.
 $(srcdir)/kea-messages.rst: mes2doc.py
        $(PYTHON) $(srcdir)/mes2doc.py -o $@
 

diff --git a/doc/sphinx/debug-messages.rst b/doc/sphinx/debug-messages.rst
index 78cd711e75f9858946a83ab4cc2e3941d8d737eb..0a68366890957e7f4ebd7a36edfd48291c0d6f3d 100644 (file)
--- a/doc/sphinx/debug-messages.rst
+++ b/doc/sphinx/debug-messages.rst
@@ -1,3 +1,6 @@
+..
+    File generated by "./tools/check-messages.py -a". Do not edit by hand.
+
 Messages printed on debuglevel 0
 ================================
 

diff --git a/doc/sphinx/kea-messages.rst b/doc/sphinx/kea-messages.rst
index 32f95c8a9420862bf07ceb3b04157472407ccec0..43f1bc8257412b8c9c5acb98778e08240b3da593 100644 (file)
--- a/doc/sphinx/kea-messages.rst
+++ b/doc/sphinx/kea-messages.rst
@@ -1,3 +1,6 @@
+..
+    File generated by "doc/sphinx/mes2doc.py" or by "make -C doc/sphinx". Do not edit by hand.
+
 .. _kea-messages:
 
 ###################

diff --git a/doc/sphinx/mes2doc.py b/doc/sphinx/mes2doc.py
index 49772282c379988aa3faf099ec23530a25b7e1cb..eb73209d0c5410b736428e1c14fb6340597134f6 100755 (executable)
--- a/doc/sphinx/mes2doc.py
+++ b/doc/sphinx/mes2doc.py
@@ -78,7 +78,10 @@ def read_input_files(files):
 
 
 def generate_rst(messages):
-    rst = '''.. _kea-messages:
+    rst = '..\n'
+    rst += '    File generated by "doc/sphinx/mes2doc.py" or by "make -C doc/sphinx". Do not edit by hand.\n\n'
+
+    rst += '''.. _kea-messages:
 
 ###################
 Kea Messages Manual

diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes
index b92314a7087bf8d7ac4cecc673da7b5155084504..98a4609bb3ada65dce06d306f796a34b8a35993f 100644 (file)
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@ -980,13 +980,13 @@ that the hint hasn't been sent.
 
 % DHCP4_REQUIRED_CLASS_EVAL_ERROR %1: Expression '%2' evaluated to %3
 This error message indicates that there a problem was encountered while
-evaluating an expression of a client class that was marked as required.
+evaluating an expression of a required client class that was marked as required.
 A description of the problem is printed.
 
 % DHCP4_REQUIRED_CLASS_EVAL_RESULT %1: Expression '%2' evaluated to %3
 Logged at debug log level 50.
-This debug message indicates that the expression of a client class has been
-successfully evaluated. The client class name and the result value of the
+This debug message indicates that the expression of a required client class has
+been successfully evaluated. The client class name and the result value of the
 evaluation are printed.
 
 % DHCP4_RESERVATIONS_LOOKUP_FIRST_ENABLED Multi-threading is enabled and host reservations lookup is always performed first.

diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes
index 678270e1306cc72f2ca212c72f60394c176114cb..3e3a08836e0bc701e9468808c7900cb9f1e784bb 100644 (file)
--- a/src/bin/dhcp6/dhcp6_messages.mes
+++ b/src/bin/dhcp6/dhcp6_messages.mes
@@ -985,13 +985,13 @@ expected IAID and IAID found respectively.
 
 % DHCP6_REQUIRED_CLASS_EVAL_ERROR %1: Expression '%2' evaluated to %3
 This error message indicates that there a problem was encountered while
-evaluating an expression of a client class that was marked as required.
+evaluating an expression of a required client class that was marked as required.
 A description of the problem is printed.
 
 % DHCP6_REQUIRED_CLASS_EVAL_RESULT %1: Expression '%2' evaluated to %3
 Logged at debug log level 50.
-This debug message indicates that the expression of a client class has been
-successfully evaluated. The client class name and the result value of the
+This debug message indicates that the expression of a required client class has
+been successfully evaluated. The client class name and the result value of the
 evaluation are printed.
 
 % DHCP6_REQUIRED_OPTIONS_CHECK_FAIL %1: %2 message received from %3 failed the following check: %4

diff --git a/src/lib/asiodns/io_fetch.cc b/src/lib/asiodns/io_fetch.cc
index 562c44c8a781c5d84ff37841fe46a0d4de606804..c140676f668bb644f767d54759ebb79dee0fb92e 100644 (file)
--- a/src/lib/asiodns/io_fetch.cc
+++ b/src/lib/asiodns/io_fetch.cc
@@ -46,7 +46,7 @@ namespace asiodns {
 
 const int DBG_IMPORTANT = DBGLVL_TRACE_BASIC;
 const int DBG_COMMON = DBGLVL_TRACE_DETAIL;
-const int DBG_ALL = DBGLVL_TRACE_ALL;
+const int DBG_VERBOSE = DBGLVL_TRACE_TECHNICAL;
 
 /// @brief IOFetch Data
 ///
@@ -316,7 +316,7 @@ IOFetch::stop(Result result) {
                 break;
 
             case SUCCESS:
-                LOG_DEBUG(logger, DBG_ALL, ASIODNS_FETCH_COMPLETED).
+                LOG_DEBUG(logger, DBG_VERBOSE, ASIODNS_FETCH_COMPLETED).
                     arg(data_->remote_rcv->getAddress().toText()).
                     arg(data_->remote_rcv->getPort());
                 break;

diff --git a/src/lib/log/log_dbglevels.cc b/src/lib/log/log_dbglevels.cc
index d2b0ebeb2db0033d8cb7e7f7a6ac80641b1f53b6..31c0941e09b10978b4961f1fb7ad3ce387bfa0b0 100644 (file)
--- a/src/lib/log/log_dbglevels.cc
+++ b/src/lib/log/log_dbglevels.cc
@@ -20,7 +20,8 @@ extern const int DBGLVL_TRACE_BASIC = 40;
 extern const int DBGLVL_TRACE_BASIC_DATA = 45;
 extern const int DBGLVL_TRACE_DETAIL = 50;
 extern const int DBGLVL_TRACE_DETAIL_DATA = 55;
-extern const int DBGLVL_TRACE_ALL = 70;
+extern const int DBGLVL_TRACE_TECHNICAL = 70;
+extern const int DBGLVL_TRACE_TECHNICAL_DATA = 90;
 
 }  // namespace log
 }  // namespace isc

diff --git a/src/lib/log/log_dbglevels.h b/src/lib/log/log_dbglevels.h
index 8fddbd0be270c97ad42f6207ebedf085248e2679..cd5d2561978e9cd7e141e2e568dad340e8dbb714 100644 (file)
--- a/src/lib/log/log_dbglevels.h
+++ b/src/lib/log/log_dbglevels.h
@@ -77,8 +77,11 @@ extern const int DBGLVL_TRACE_DETAIL;
 /// @brief Trace data associated with detailed operations.
 extern const int DBGLVL_TRACE_DETAIL_DATA;
 
-/// @brief The highest level of debug logging.
-extern const int DBGLVL_TRACE_ALL;
+/// @brief Trace technical operations.
+extern const int DBGLVL_TRACE_TECHNICAL;
+
+/// @brief Trace data associated with technical operations.
+extern const int DBGLVL_TRACE_TECHNICAL_DATA;
 
 }  // log namespace
 }  // isc namespace

diff --git a/tools/check-messages.py b/tools/check-messages.py
index 63d7149e40896d9c9181acfe911e68568149c8ef..aaa1773c5b03465eb49beb5ea05904d62f40ae6b 100755 (executable)
--- a/tools/check-messages.py
+++ b/tools/check-messages.py
@@ -149,16 +149,22 @@ def check_placeholder_ids(messages):
 def generate_page_with_messages_printed_on_each_debug_level(messages, debug_levels):
     content = []
     for log_level in sorted(set(debug_levels.values())):
+        messages_at_this_log_level = [(message_id, message) for message_id, message in sorted(messages.items())
+                                      if message['debug_log_level_line'] == f'Logged at debug log level {log_level}.']
+        if len(messages_at_this_log_level) == 0:
+            # Do not write "Messages printed" subtitle if there are no messages.
+            continue
         subtitle = f'Messages printed on debuglevel {log_level}'
         content.append(subtitle)
         content.append('=' * len(subtitle))
         content.append('\n')
-        for message_id, message in sorted(messages.items()):
-            if message['debug_log_level_line'] == f'Logged at debug log level {log_level}.':
-                content.append(f'- {message_id}')
+        for message_id, message in messages_at_this_log_level:
+            content.append(f'- {message_id}')
         content.append('\n')
     parent_dir = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0])))
     with open(f'{parent_dir}/../doc/sphinx/debug-messages.rst', 'w', encoding='utf-8') as f:
+        f.write('..\n')
+        f.write('    File generated by "./tools/check-messages.py -a". Do not edit by hand.\n\n')
         for i in content:
             f.write(i)
             f.write('\n')