File tree 10 files changed +37
-19
lines changed 10 files changed +37
-19
lines changed Original file line number Diff line number Diff line change @@ -61,9 +61,9 @@ api_files =
61
61
include $(top_srcdir ) /src/share/api/api_files.mk
62
62
63
63
if HAVE_PDFLATEX
64
- all : html mans pdf text
64
+ all : kea-messages.rst html mans pdf text
65
65
else
66
- all : html mans text
66
+ all : kea-messages.rst html mans text
67
67
endif
68
68
69
69
# build the list of message files
@@ -73,8 +73,7 @@ mes_files.mk: mes-files.txt
73
73
mes-files.txt :
74
74
@find ../.. -type f -name ' *.mes' | sort -V | sed ' s#^../../##g' > $@
75
75
76
- # this rule is only used for development purposes and is not used in official
77
- # build process as kea-messages.rst is always generated via sphinx's conf.py
76
+ # Used in official build process. kea-messages.rst is generated via mes2doc.py.
78
77
$(srcdir ) /kea-messages.rst : mes2doc.py
79
78
$(PYTHON ) $(srcdir ) /mes2doc.py -o $@
80
79
Original file line number Diff line number Diff line change
1
+ ..
2
+ File generated by "./tools/check-messages.py -a". Do not edit by hand.
3
+
1
4
Messages printed on debuglevel 0
2
5
================================
3
6
Original file line number Diff line number Diff line change
1
+ ..
2
+ File generated by "doc/sphinx/mes2doc.py" or by "make -C doc/sphinx". Do not edit by hand.
3
+
1
4
.. _kea-messages:
2
5
3
6
###################
Original file line number Diff line number Diff line change @@ -78,7 +78,10 @@ def read_input_files(files):
78
78
79
79
80
80
def generate_rst (messages ):
81
- rst = '''.. _kea-messages:
81
+ rst = '..\n '
82
+ rst += ' File generated by "doc/sphinx/mes2doc.py" or by "make -C doc/sphinx". Do not edit by hand.\n \n '
83
+
84
+ rst += '''.. _kea-messages:
82
85
83
86
###################
84
87
Kea Messages Manual
Original file line number Diff line number Diff line change @@ -980,13 +980,13 @@ that the hint hasn't been sent.
980
980
981
981
% DHCP4_REQUIRED_CLASS_EVAL_ERROR %1: Expression '%2' evaluated to %3
982
982
This error message indicates that there a problem was encountered while
983
- evaluating an expression of a client class that was marked as required.
983
+ evaluating an expression of a required client class that was marked as required.
984
984
A description of the problem is printed.
985
985
986
986
% DHCP4_REQUIRED_CLASS_EVAL_RESULT %1: Expression '%2' evaluated to %3
987
987
Logged at debug log level 50.
988
- This debug message indicates that the expression of a client class has been
989
- successfully evaluated. The client class name and the result value of the
988
+ This debug message indicates that the expression of a required client class has
989
+ been successfully evaluated. The client class name and the result value of the
990
990
evaluation are printed.
991
991
992
992
% DHCP4_RESERVATIONS_LOOKUP_FIRST_ENABLED Multi-threading is enabled and host reservations lookup is always performed first.
Original file line number Diff line number Diff line change @@ -985,13 +985,13 @@ expected IAID and IAID found respectively.
985
985
986
986
% DHCP6_REQUIRED_CLASS_EVAL_ERROR %1: Expression '%2' evaluated to %3
987
987
This error message indicates that there a problem was encountered while
988
- evaluating an expression of a client class that was marked as required.
988
+ evaluating an expression of a required client class that was marked as required.
989
989
A description of the problem is printed.
990
990
991
991
% DHCP6_REQUIRED_CLASS_EVAL_RESULT %1: Expression '%2' evaluated to %3
992
992
Logged at debug log level 50.
993
- This debug message indicates that the expression of a client class has been
994
- successfully evaluated. The client class name and the result value of the
993
+ This debug message indicates that the expression of a required client class has
994
+ been successfully evaluated. The client class name and the result value of the
995
995
evaluation are printed.
996
996
997
997
% DHCP6_REQUIRED_OPTIONS_CHECK_FAIL %1: %2 message received from %3 failed the following check: %4
Original file line number Diff line number Diff line change @@ -46,7 +46,7 @@ namespace asiodns {
46
46
47
47
const int DBG_IMPORTANT = DBGLVL_TRACE_BASIC;
48
48
const int DBG_COMMON = DBGLVL_TRACE_DETAIL;
49
- const int DBG_ALL = DBGLVL_TRACE_ALL ;
49
+ const int DBG_VERBOSE = DBGLVL_TRACE_TECHNICAL ;
50
50
51
51
// / @brief IOFetch Data
52
52
// /
@@ -316,7 +316,7 @@ IOFetch::stop(Result result) {
316
316
break ;
317
317
318
318
case SUCCESS:
319
- LOG_DEBUG (logger, DBG_ALL , ASIODNS_FETCH_COMPLETED).
319
+ LOG_DEBUG (logger, DBG_VERBOSE , ASIODNS_FETCH_COMPLETED).
320
320
arg (data_->remote_rcv ->getAddress ().toText ()).
321
321
arg (data_->remote_rcv ->getPort ());
322
322
break ;
Original file line number Diff line number Diff line change @@ -20,7 +20,8 @@ extern const int DBGLVL_TRACE_BASIC = 40;
20
20
extern const int DBGLVL_TRACE_BASIC_DATA = 45 ;
21
21
extern const int DBGLVL_TRACE_DETAIL = 50 ;
22
22
extern const int DBGLVL_TRACE_DETAIL_DATA = 55 ;
23
- extern const int DBGLVL_TRACE_ALL = 70 ;
23
+ extern const int DBGLVL_TRACE_TECHNICAL = 70 ;
24
+ extern const int DBGLVL_TRACE_TECHNICAL_DATA = 90 ;
24
25
25
26
} // namespace log
26
27
} // namespace isc
Original file line number Diff line number Diff line change @@ -77,8 +77,11 @@ extern const int DBGLVL_TRACE_DETAIL;
77
77
// / @brief Trace data associated with detailed operations.
78
78
extern const int DBGLVL_TRACE_DETAIL_DATA;
79
79
80
- // / @brief The highest level of debug logging.
81
- extern const int DBGLVL_TRACE_ALL;
80
+ // / @brief Trace technical operations.
81
+ extern const int DBGLVL_TRACE_TECHNICAL;
82
+
83
+ // / @brief Trace data associated with technical operations.
84
+ extern const int DBGLVL_TRACE_TECHNICAL_DATA;
82
85
83
86
} // log namespace
84
87
} // isc namespace
Original file line number Diff line number Diff line change @@ -149,16 +149,22 @@ def check_placeholder_ids(messages):
149
149
def generate_page_with_messages_printed_on_each_debug_level (messages , debug_levels ):
150
150
content = []
151
151
for log_level in sorted (set (debug_levels .values ())):
152
+ messages_at_this_log_level = [(message_id , message ) for message_id , message in sorted (messages .items ())
153
+ if message ['debug_log_level_line' ] == f'Logged at debug log level { log_level } .' ]
154
+ if len (messages_at_this_log_level ) == 0 :
155
+ # Do not write "Messages printed" subtitle if there are no messages.
156
+ continue
152
157
subtitle = f'Messages printed on debuglevel { log_level } '
153
158
content .append (subtitle )
154
159
content .append ('=' * len (subtitle ))
155
160
content .append ('\n ' )
156
- for message_id , message in sorted (messages .items ()):
157
- if message ['debug_log_level_line' ] == f'Logged at debug log level { log_level } .' :
158
- content .append (f'- { message_id } ' )
161
+ for message_id , message in messages_at_this_log_level :
162
+ content .append (f'- { message_id } ' )
159
163
content .append ('\n ' )
160
164
parent_dir = os .path .dirname (os .path .realpath (os .path .abspath (sys .argv [0 ])))
161
165
with open (f'{ parent_dir } /../doc/sphinx/debug-messages.rst' , 'w' , encoding = 'utf-8' ) as f :
166
+ f .write ('..\n ' )
167
+ f .write (' File generated by "./tools/check-messages.py -a". Do not edit by hand.\n \n ' )
162
168
for i in content :
163
169
f .write (i )
164
170
f .write ('\n ' )
You can’t perform that action at this time.
0 commit comments