From: Francis Dupont Date: Mon, 7 Jan 2019 09:42:38 +0000 (+0100) Subject: [208-move-logging-from-global-objects-to-global-params] Extended syntax for loggers X-Git-Tag: Kea-1.6.0-beta~102 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc24c90c843ed009c4557fb9eb9b5493178f7c21;p=thirdparty%2Fkea.git [208-move-logging-from-global-objects-to-global-params] Extended syntax for loggers --- diff --git a/src/bin/agent/agent_lexer.ll b/src/bin/agent/agent_lexer.ll index aa1f92c825..e7d56b0649 100644 --- a/src/bin/agent/agent_lexer.ll +++ b/src/bin/agent/agent_lexer.ll @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC") +/* Copyright (C) 2017-2019 Internet Systems Consortium, Inc. ("ISC") This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this @@ -323,6 +323,7 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence} \"loggers\" { switch(driver.ctx_) { + case ParserContext::AGENT: case ParserContext::LOGGING: return AgentParser::make_LOGGERS(driver.loc_); default: diff --git a/src/bin/agent/agent_parser.yy b/src/bin/agent/agent_parser.yy index fe590f7fea..3c9a095352 100644 --- a/src/bin/agent/agent_parser.yy +++ b/src/bin/agent/agent_parser.yy @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC") +/* Copyright (C) 2017-2019 Internet Systems Consortium, Inc. ("ISC") This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this @@ -273,6 +273,7 @@ global_param: http_host | http_port | control_sockets | hooks_libraries + | loggers | user_context | comment | unknown_map_entry diff --git a/src/bin/d2/d2_lexer.ll b/src/bin/d2/d2_lexer.ll index df44c7e7fe..5decb57ead 100644 --- a/src/bin/d2/d2_lexer.ll +++ b/src/bin/d2/d2_lexer.ll @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC") +/* Copyright (C) 2017-2019 Internet Systems Consortium, Inc. ("ISC") This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this @@ -431,6 +431,7 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence} \"loggers\" { switch(driver.ctx_) { + case isc::d2::D2ParserContext::DHCPDDNS: case isc::d2::D2ParserContext::LOGGING: return isc::d2::D2Parser::make_LOGGERS(driver.loc_); default: diff --git a/src/bin/d2/d2_parser.yy b/src/bin/d2/d2_parser.yy index f3c770d7bd..5fd42a1f73 100644 --- a/src/bin/d2/d2_parser.yy +++ b/src/bin/d2/d2_parser.yy @@ -1,4 +1,4 @@ -/* Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC") +/* Copyright (C) 2017-2019 Internet Systems Consortium, Inc. ("ISC") This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this @@ -275,6 +275,7 @@ dhcpddns_param: ip_address | reverse_ddns | tsig_keys | control_socket + | loggers | user_context | comment | unknown_map_entry diff --git a/src/bin/dhcp4/dhcp4_lexer.ll b/src/bin/dhcp4/dhcp4_lexer.ll index bbdbe99082..a96e38d020 100644 --- a/src/bin/dhcp4/dhcp4_lexer.ll +++ b/src/bin/dhcp4/dhcp4_lexer.ll @@ -917,6 +917,7 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence} \"loggers\" { switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP4: case isc::dhcp::Parser4Context::LOGGING: return isc::dhcp::Dhcp4Parser::make_LOGGERS(driver.loc_); default: diff --git a/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp4/dhcp4_parser.yy index 9c63d86838..46901ce819 100644 --- a/src/bin/dhcp4/dhcp4_parser.yy +++ b/src/bin/dhcp4/dhcp4_parser.yy @@ -476,6 +476,7 @@ global_param: valid_lifetime | calculate_tee_times | t1_percent | t2_percent + | loggers | unknown_map_entry ; diff --git a/src/bin/dhcp6/dhcp6_lexer.ll b/src/bin/dhcp6/dhcp6_lexer.ll index 10c54e8219..a91bb5460a 100644 --- a/src/bin/dhcp6/dhcp6_lexer.ll +++ b/src/bin/dhcp6/dhcp6_lexer.ll @@ -1215,6 +1215,7 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence} \"loggers\" { switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP6: case isc::dhcp::Parser6Context::LOGGING: return isc::dhcp::Dhcp6Parser::make_LOGGERS(driver.loc_); default: diff --git a/src/bin/dhcp6/dhcp6_parser.yy b/src/bin/dhcp6/dhcp6_parser.yy index 72e1fba3ab..4b2d4b1045 100644 --- a/src/bin/dhcp6/dhcp6_parser.yy +++ b/src/bin/dhcp6/dhcp6_parser.yy @@ -478,6 +478,7 @@ global_param: data_directory | calculate_tee_times | t1_percent | t2_percent + | loggers | unknown_map_entry ; diff --git a/src/bin/netconf/netconf_lexer.ll b/src/bin/netconf/netconf_lexer.ll index 5862e9701c..26b3e5117b 100644 --- a/src/bin/netconf/netconf_lexer.ll +++ b/src/bin/netconf/netconf_lexer.ll @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC") +/* Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC") This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this @@ -391,6 +391,7 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence} \"loggers\" { switch(driver.ctx_) { + case ParserContext::NETCONF: case ParserContext::LOGGING: return NetconfParser::make_LOGGERS(driver.loc_); default: diff --git a/src/bin/netconf/netconf_parser.yy b/src/bin/netconf/netconf_parser.yy index e7ccfe38f0..56898e07b9 100644 --- a/src/bin/netconf/netconf_parser.yy +++ b/src/bin/netconf/netconf_parser.yy @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC") +/* Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC") This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this @@ -277,6 +277,7 @@ global_param: boot_update | validate_changes | managed_servers | hooks_libraries + | loggers | user_context | comment | unknown_map_entry