[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 aa1f92c825b11585b13ef292dd030a30124a514a..e7d56b06490ac198180e15a6c6add839fc2b4da2 100644 (file)
--- 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 fe590f7fea7f685f9a4ef42bd3b1d5d4a5b17320..3c9a09535243cc6e5a370fb3c922788856e05476 100644 (file)
--- 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 df44c7e7fe22064e1c70b038467901fe80a757b1..5decb57ead9af2b3a902a46c0b08e17463e26c06 100644 (file)
--- 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 f3c770d7bd35d954cf13cec6e60fd1f2c7fc5178..5fd42a1f733eea67f41c991787c7051fffed6ddd 100644 (file)
--- 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 bbdbe99082fb895f3d3dd46d18a9766f56a4b45d..a96e38d02067d00f1fa26e8b24c39e0025688876 100644 (file)
--- 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 9c63d868388bc66fc3971da9eee81065ead8266e..46901ce819bdc3826f967a1c12cdf9ff44f5add6 100644 (file)
--- 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 10c54e8219c39d555bf8fb554e0ac4d37a5a1809..a91bb5460a0760fb25bc41666ddec9979ecf4cdb 100644 (file)
--- 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 72e1fba3abf662af3f7d171c8d0773e1dcfb7d6f..4b2d4b1045574dc74907d91814902f922762eab9 100644 (file)
--- 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 5862e9701c041e8f211363afd175ae4459717cfc..26b3e5117b2414d6e82834f6d41626841f433e26 100644 (file)
--- 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 e7ccfe38f064ec517c4d9ecb5d92e9bd8426dc5b..56898e07b974f0184d92ef605cf21498b851bff5 100644 (file)
--- 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