From: Marcin Siodelski Date: Wed, 27 Sep 2017 15:22:35 +0000 (+0200) Subject: [5338] Update logging configuration for specific daemons. X-Git-Tag: trac5361_base^2~1^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5160f195ccbe795beaab19ce3fa82d64a7e496d3;p=thirdparty%2Fkea.git [5338] Update logging configuration for specific daemons. --- diff --git a/doc/guide/agent.xml b/doc/guide/agent.xml index a7b5c74b93..90dffee1c7 100644 --- a/doc/guide/agent.xml +++ b/doc/guide/agent.xml @@ -297,7 +297,7 @@ http { The CA is started by running its binary and specifying the configuration file it should use. For example: -$ ./kea-ctrl-agent -c /usr/local/etc/kea/kea.conf +$ ./kea-ctrl-agent -c /usr/local/etc/kea/kea-ctrl-agent.conf diff --git a/doc/guide/keactrl.xml b/doc/guide/keactrl.xml index a39be5cf56..7e0aa4aa8d 100644 --- a/doc/guide/keactrl.xml +++ b/doc/guide/keactrl.xml @@ -73,7 +73,11 @@ keactrl <command> [-c keactrl-config-file] [-s server[,server,..]] prefix=@prefix@ # Location of Kea configuration file. -kea_config_file=@sysconfdir@/@PACKAGE@/kea.conf +kea_dhcp4_config_file=@sysconfdir@/@PACKAGE@/kea-dhcp4.conf +kea_dhcp6_config_file=@sysconfdir@/@PACKAGE@/kea-dhcp6.conf +kea_dhcp_ddns_config_file=@sysconfdir@/@PACKAGE@/kea-dhcp-ddns.conf +kea_ctrl_agent_config_file=@sysconfdir@/@PACKAGE@/kea-ctrl-agent.conf + # Location of Kea binaries. exec_prefix=@exec_prefix@ @@ -168,10 +172,10 @@ kea_verbose=no the servers looks similar to the following: $ keactrl start -INFO/keactrl: Starting kea-dhcp4 -c /usr/local/etc/kea/kea.conf -d -INFO/keactrl: Starting kea-dhcp6 -c /usr/local/etc/kea/kea.conf -d -INFO/keactrl: Starting kea-dhcp-ddns -c /usr/local/etc/kea/kea.conf -d -INFO/keactrl: Starting kea-ctrl-agent -c /usr/local/etc/kea/kea.conf -d +INFO/keactrl: Starting kea-dhcp4 -c /usr/local/etc/kea/kea-dhcp4.conf -d +INFO/keactrl: Starting kea-dhcp6 -c /usr/local/etc/kea/kea-dhcp6.conf -d +INFO/keactrl: Starting kea-dhcp-ddns -c /usr/local/etc/kea/kea-dhcp-ddns.conf -d +INFO/keactrl: Starting kea-ctrl-agent -c /usr/local/etc/kea/kea-ctrl-agent.conf -d @@ -261,6 +265,10 @@ DHCPv6 server: inactive DHCP DDNS: active Control Agent: active Kea configuration file: /usr/local/etc/kea/kea.conf +Kea DHCPv4 configuration file: /usr/local/etc/kea/kea-dhcp4.conf +Kea DHCPv6 configuration file: /usr/local/etc/kea/kea-dhcp6.conf +Kea DHCP DDNS configuration file: /usr/local/etc/kea/kea-dhcp-ddns.conf +Kea Control Agent configuration file: /usr/local/etc/kea/kea-ctrl-agent.conf keactrl configuration file: /usr/local/etc/kea/keactrl.conf diff --git a/doc/guide/quickstart.xml b/doc/guide/quickstart.xml index 74e97f174c..4e7f1e119f 100644 --- a/doc/guide/quickstart.xml +++ b/doc/guide/quickstart.xml @@ -61,6 +61,14 @@ $ ./configure [your extra parameters] + + Edit the Kea configuration files which by default are installed in + the [kea-install-dir]/etc/kea/ directory. These are: + kea-dhcp4.conf, kea-dhcp6.conf, kea-dhcp-ddns.conf and kea-ctrl-agent.conf, + for DHCPv4 server, DHCPv6 server, D2 and Control Agent respectively. + + + Edit the configuration file which by default is installed in [kea-install-dir]/etc/kea/kea.conf and contains diff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre index 19039e943e..83e6efe215 100644 --- a/src/bin/keactrl/kea-ctrl-agent.conf.pre +++ b/src/bin/keactrl/kea-ctrl-agent.conf.pre @@ -51,10 +51,8 @@ { "loggers": [ { - // This section affects kea-dhcp4, which is the base logger for DHCPv4 - // component. It tells DHCPv4 server to write all log messages (on - // severity INFO or more) to a file. - "name": "kea-dhcp4", + // This specifies the logging for Control Agent daemon. + "name": "kea-ctrl-agent", "output_options": [ { // Specifies the output file. There are several special values @@ -64,7 +62,7 @@ // - syslog (logs to syslog) // - syslog:name (logs to syslog using specified name) // Any other value is considered a name of a time - "output": "@localstatedir@/log/kea-dhcp4.log" + "output": "@localstatedir@/log/kea-ctrl-agent.log" // This governs whether the log output is flushed to disk after // every write. @@ -86,39 +84,6 @@ // 99 is most verbose. Be cautious, Kea can generate lots and lots // of logs if told to do so. "debuglevel": 0 - }, - { - // This specifies the logging for kea-dhcp6 logger, i.e. all logs - // generated by Kea DHCPv6 server. - "name": "kea-dhcp6", - "output_options": [ - { - "output": "@localstatedir@/log/kea-dhcp6.log" - } - ], - "severity": "INFO", - "debuglevel": 0 - }, - { - // This specifies the logging for D2 (DHCP-DDNS) daemon. - "name": "kea-dhcp-ddns", - "output_options": [ - { - "output": "@localstatedir@/log/kea-ddns.log" - } - ], - "severity": "INFO", - "debuglevel": 0 - }, - { - "name": "kea-ctrl-agent", - "output_options": [ - { - "output": "@localstatedir@/log/kea-ctrl-agent.log" - } - ], - "severity": "INFO", - "debuglevel": 0 } ] } diff --git a/src/bin/keactrl/kea-dhcp-ddns.conf.pre b/src/bin/keactrl/kea-dhcp-ddns.conf.pre index 3b174c505f..3bd9290d4f 100644 --- a/src/bin/keactrl/kea-dhcp-ddns.conf.pre +++ b/src/bin/keactrl/kea-dhcp-ddns.conf.pre @@ -63,10 +63,8 @@ { "loggers": [ { - // This section affects kea-dhcp4, which is the base logger for DHCPv4 - // component. It tells DHCPv4 server to write all log messages (on - // severity INFO or more) to a file. - "name": "kea-dhcp4", + // This specifies the logging for D2 (DHCP-DDNS) daemon. + "name": "kea-dhcp-ddns", "output_options": [ { // Specifies the output file. There are several special values @@ -76,7 +74,7 @@ // - syslog (logs to syslog) // - syslog:name (logs to syslog using specified name) // Any other value is considered a name of a time - "output": "@localstatedir@/log/kea-dhcp4.log" + "output": "@localstatedir@/log/kea-ddns.log" // This governs whether the log output is flushed to disk after // every write. @@ -98,39 +96,6 @@ // 99 is most verbose. Be cautious, Kea can generate lots and lots // of logs if told to do so. "debuglevel": 0 - }, - { - // This specifies the logging for kea-dhcp6 logger, i.e. all logs - // generated by Kea DHCPv6 server. - "name": "kea-dhcp6", - "output_options": [ - { - "output": "@localstatedir@/log/kea-dhcp6.log" - } - ], - "severity": "INFO", - "debuglevel": 0 - }, - { - // This specifies the logging for D2 (DHCP-DDNS) daemon. - "name": "kea-dhcp-ddns", - "output_options": [ - { - "output": "@localstatedir@/log/kea-ddns.log" - } - ], - "severity": "INFO", - "debuglevel": 0 - }, - { - "name": "kea-ctrl-agent", - "output_options": [ - { - "output": "@localstatedir@/log/kea-ctrl-agent.log" - } - ], - "severity": "INFO", - "debuglevel": 0 } ] } diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre index 170f324726..2e6b5815c3 100644 --- a/src/bin/keactrl/kea-dhcp4.conf.pre +++ b/src/bin/keactrl/kea-dhcp4.conf.pre @@ -448,39 +448,6 @@ // 99 is most verbose. Be cautious, Kea can generate lots and lots // of logs if told to do so. "debuglevel": 0 - }, - { - // This specifies the logging for kea-dhcp6 logger, i.e. all logs - // generated by Kea DHCPv6 server. - "name": "kea-dhcp6", - "output_options": [ - { - "output": "@localstatedir@/log/kea-dhcp6.log" - } - ], - "severity": "INFO", - "debuglevel": 0 - }, - { - // This specifies the logging for D2 (DHCP-DDNS) daemon. - "name": "kea-dhcp-ddns", - "output_options": [ - { - "output": "@localstatedir@/log/kea-ddns.log" - } - ], - "severity": "INFO", - "debuglevel": 0 - }, - { - "name": "kea-ctrl-agent", - "output_options": [ - { - "output": "@localstatedir@/log/kea-ctrl-agent.log" - } - ], - "severity": "INFO", - "debuglevel": 0 } ] } diff --git a/src/bin/keactrl/kea-dhcp6.conf.pre b/src/bin/keactrl/kea-dhcp6.conf.pre index 77cae95c04..51899729ce 100644 --- a/src/bin/keactrl/kea-dhcp6.conf.pre +++ b/src/bin/keactrl/kea-dhcp6.conf.pre @@ -340,10 +340,9 @@ { "loggers": [ { - // This section affects kea-dhcp4, which is the base logger for DHCPv4 - // component. It tells DHCPv4 server to write all log messages (on - // severity INFO or more) to a file. - "name": "kea-dhcp4", + // This specifies the logging for kea-dhcp6 logger, i.e. all logs + // generated by Kea DHCPv6 server. + "name": "kea-dhcp6", "output_options": [ { // Specifies the output file. There are several special values @@ -353,7 +352,7 @@ // - syslog (logs to syslog) // - syslog:name (logs to syslog using specified name) // Any other value is considered a name of a time - "output": "@localstatedir@/log/kea-dhcp4.log" + "output": "@localstatedir@/log/kea-dhcp6.log" // This governs whether the log output is flushed to disk after // every write. @@ -375,39 +374,6 @@ // 99 is most verbose. Be cautious, Kea can generate lots and lots // of logs if told to do so. "debuglevel": 0 - }, - { - // This specifies the logging for kea-dhcp6 logger, i.e. all logs - // generated by Kea DHCPv6 server. - "name": "kea-dhcp6", - "output_options": [ - { - "output": "@localstatedir@/log/kea-dhcp6.log" - } - ], - "severity": "INFO", - "debuglevel": 0 - }, - { - // This specifies the logging for D2 (DHCP-DDNS) daemon. - "name": "kea-dhcp-ddns", - "output_options": [ - { - "output": "@localstatedir@/log/kea-ddns.log" - } - ], - "severity": "INFO", - "debuglevel": 0 - }, - { - "name": "kea-ctrl-agent", - "output_options": [ - { - "output": "@localstatedir@/log/kea-ctrl-agent.log" - } - ], - "severity": "INFO", - "debuglevel": 0 } ] }