diff options
| author | Francis Dupont <fdupont@isc.org> | 2019-01-07 19:42:03 +0100 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2019-05-23 00:10:24 +0200 |
| commit | 7bc4cc182af343fc0daeef92a78f5d8ea0f38dc8 (patch) | |
| tree | 6fdc34eabab3f6b13a594b8d3b8c1a98d0468a45 /src/bin/netconf | |
| parent | [#208,!196] regen flex/bison (diff) | |
| download | kea-7bc4cc182af343fc0daeef92a78f5d8ea0f38dc8.tar.xz kea-7bc4cc182af343fc0daeef92a78f5d8ea0f38dc8.zip | |
[208-move-logging-from-global-objects-to-global-params] Almost done. Checkpoint of the day
Diffstat (limited to 'src/bin/netconf')
| -rw-r--r-- | src/bin/netconf/netconf_cfg_mgr.cc | 7 | ||||
| -rw-r--r-- | src/bin/netconf/parser_context.h | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/bin/netconf/netconf_cfg_mgr.cc b/src/bin/netconf/netconf_cfg_mgr.cc index 5cddc3a5c2..7208280723 100644 --- a/src/bin/netconf/netconf_cfg_mgr.cc +++ b/src/bin/netconf/netconf_cfg_mgr.cc @@ -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 @@ -144,7 +144,7 @@ NetconfCfgMgr::parse(isc::data::ConstElementPtr config_set, ElementPtr NetconfConfig::toElement() const { - ElementPtr netconf = Element::createMap(); + ElementPtr netconf = ConfigBase::toElement(); // Set user-context contextToElement(netconf); // Add in explicitly configured globals. @@ -161,9 +161,6 @@ NetconfConfig::toElement() const { // Set Netconf ElementPtr result = Element::createMap(); result->set("Netconf", netconf); - - // Set Logging (not yet) - return (result); } diff --git a/src/bin/netconf/parser_context.h b/src/bin/netconf/parser_context.h index a75a89c477..b83fc09ecb 100644 --- a/src/bin/netconf/parser_context.h +++ b/src/bin/netconf/parser_context.h @@ -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 @@ -190,10 +190,10 @@ public: ///< Used while parsing Netconf/hooks-libraries. HOOKS_LIBRARIES, - ///< Used while parsing Logging/loggers structures. + ///< Used while parsing Netconf/loggers structures. LOGGERS, - ///< Used while parsing Logging/loggers/output_options structures. + ///< Used while parsing Netconf/loggers/output_options structures. OUTPUT_OPTIONS } LexerContext; |