Commit fc24c90c authored by Francis Dupont's avatar Francis Dupont
Browse files

[208-move-logging-from-global-objects-to-global-params] Extended syntax for loggers

parent 5c739a1c
/* 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 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 License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -323,6 +323,7 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence} ...@@ -323,6 +323,7 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
\"loggers\" { \"loggers\" {
switch(driver.ctx_) { switch(driver.ctx_) {
case ParserContext::AGENT:
case ParserContext::LOGGING: case ParserContext::LOGGING:
return AgentParser::make_LOGGERS(driver.loc_); return AgentParser::make_LOGGERS(driver.loc_);
default: default:
......
/* 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 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 License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -273,6 +273,7 @@ global_param: http_host ...@@ -273,6 +273,7 @@ global_param: http_host
| http_port | http_port
| control_sockets | control_sockets
| hooks_libraries | hooks_libraries
| loggers
| user_context | user_context
| comment | comment
| unknown_map_entry | unknown_map_entry
......
/* 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 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 License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -431,6 +431,7 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence} ...@@ -431,6 +431,7 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
\"loggers\" { \"loggers\" {
switch(driver.ctx_) { switch(driver.ctx_) {
case isc::d2::D2ParserContext::DHCPDDNS:
case isc::d2::D2ParserContext::LOGGING: case isc::d2::D2ParserContext::LOGGING:
return isc::d2::D2Parser::make_LOGGERS(driver.loc_); return isc::d2::D2Parser::make_LOGGERS(driver.loc_);
default: default:
......
/* 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 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 License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -275,6 +275,7 @@ dhcpddns_param: ip_address ...@@ -275,6 +275,7 @@ dhcpddns_param: ip_address
| reverse_ddns | reverse_ddns
| tsig_keys | tsig_keys
| control_socket | control_socket
| loggers
| user_context | user_context
| comment | comment
| unknown_map_entry | unknown_map_entry
......
...@@ -917,6 +917,7 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence} ...@@ -917,6 +917,7 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
\"loggers\" { \"loggers\" {
switch(driver.ctx_) { switch(driver.ctx_) {
case isc::dhcp::Parser4Context::DHCP4:
case isc::dhcp::Parser4Context::LOGGING: case isc::dhcp::Parser4Context::LOGGING:
return isc::dhcp::Dhcp4Parser::make_LOGGERS(driver.loc_); return isc::dhcp::Dhcp4Parser::make_LOGGERS(driver.loc_);
default: default:
......
...@@ -476,6 +476,7 @@ global_param: valid_lifetime ...@@ -476,6 +476,7 @@ global_param: valid_lifetime
| calculate_tee_times | calculate_tee_times
| t1_percent | t1_percent
| t2_percent | t2_percent
| loggers
| unknown_map_entry | unknown_map_entry
; ;
......
...@@ -1215,6 +1215,7 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence} ...@@ -1215,6 +1215,7 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
\"loggers\" { \"loggers\" {
switch(driver.ctx_) { switch(driver.ctx_) {
case isc::dhcp::Parser6Context::DHCP6:
case isc::dhcp::Parser6Context::LOGGING: case isc::dhcp::Parser6Context::LOGGING:
return isc::dhcp::Dhcp6Parser::make_LOGGERS(driver.loc_); return isc::dhcp::Dhcp6Parser::make_LOGGERS(driver.loc_);
default: default:
......
...@@ -478,6 +478,7 @@ global_param: data_directory ...@@ -478,6 +478,7 @@ global_param: data_directory
| calculate_tee_times | calculate_tee_times
| t1_percent | t1_percent
| t2_percent | t2_percent
| loggers
| unknown_map_entry | unknown_map_entry
; ;
......
/* 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 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 License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -391,6 +391,7 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence} ...@@ -391,6 +391,7 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
\"loggers\" { \"loggers\" {
switch(driver.ctx_) { switch(driver.ctx_) {
case ParserContext::NETCONF:
case ParserContext::LOGGING: case ParserContext::LOGGING:
return NetconfParser::make_LOGGERS(driver.loc_); return NetconfParser::make_LOGGERS(driver.loc_);
default: default:
......
/* 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 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 License, v. 2.0. If a copy of the MPL was not distributed with this
...@@ -277,6 +277,7 @@ global_param: boot_update ...@@ -277,6 +277,7 @@ global_param: boot_update
| validate_changes | validate_changes
| managed_servers | managed_servers
| hooks_libraries | hooks_libraries
| loggers
| user_context | user_context
| comment | comment
| unknown_map_entry | unknown_map_entry
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment