From: Michal Nowikowski <godfryd@isc.org>
Date: Wed, 14 Aug 2019 12:24:44 +0000 (+0200)
Subject: added pattern field to config files in src/bin/keactrl/*conf.pre but commented to... 
X-Git-Tag: Kea-1.6.0~41^2~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee22043fff7b1df67d20ac44e35505225f32806e;p=thirdparty%2Fkea.git

added pattern field to config files in src/bin/keactrl/*conf.pre but commented to be used for deb/rpm packaging
---

diff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre
index 0563a3a4c7..dae8d74050 100644
--- a/src/bin/keactrl/kea-ctrl-agent.conf.pre
+++ b/src/bin/keactrl/kea-ctrl-agent.conf.pre
@@ -69,6 +69,10 @@
                 // Any other value is considered a name of a time
                 "output": "@localstatedir@/log/kea-ctrl-agent.log"
 
+                // Shorter log pattern suitable for use with systemd,
+                // avoids redundant information
+                // "pattern": "%-5p %m\n"
+
                 // This governs whether the log output is flushed to disk after
                 // every write.
                 // "flush": false,
diff --git a/src/bin/keactrl/kea-dhcp-ddns.conf.pre b/src/bin/keactrl/kea-dhcp-ddns.conf.pre
index cc75cf1eb1..042ac5237d 100644
--- a/src/bin/keactrl/kea-dhcp-ddns.conf.pre
+++ b/src/bin/keactrl/kea-dhcp-ddns.conf.pre
@@ -46,6 +46,10 @@
                 // Any other value is considered a name of a time
                 "output": "@localstatedir@/log/kea-ddns.log"
 
+                // Shorter log pattern suitable for use with systemd,
+                // avoids redundant information
+                // "pattern": "%-5p %m\n"
+
                 // This governs whether the log output is flushed to disk after
                 // every write.
                 // "flush": false,
diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre
index ccfdba53f6..ad4e334b86 100644
--- a/src/bin/keactrl/kea-dhcp4.conf.pre
+++ b/src/bin/keactrl/kea-dhcp4.conf.pre
@@ -430,6 +430,10 @@
                 // Any other value is considered a name of a time
                 "output": "@localstatedir@/log/kea-dhcp4.log"
 
+                // Shorter log pattern suitable for use with systemd,
+                // avoids redundant information
+                // "pattern": "%-5p %m\n"
+
                 // This governs whether the log output is flushed to disk after
                 // every write.
                 // "flush": false,
diff --git a/src/bin/keactrl/kea-dhcp6.conf.pre b/src/bin/keactrl/kea-dhcp6.conf.pre
index 36aa474cb3..29f52d2a8e 100644
--- a/src/bin/keactrl/kea-dhcp6.conf.pre
+++ b/src/bin/keactrl/kea-dhcp6.conf.pre
@@ -355,6 +355,10 @@
                 // Any other value is considered a name of a time
                 "output": "@localstatedir@/log/kea-dhcp6.log"
 
+                // Shorter log pattern suitable for use with systemd,
+                // avoids redundant information
+                // "pattern": "%-5p %m\n"
+
                 // This governs whether the log output is flushed to disk after
                 // every write.
                 // "flush": false,
diff --git a/src/bin/keactrl/kea-netconf.conf.pre b/src/bin/keactrl/kea-netconf.conf.pre
index 6cd84acc6c..e6f38812d8 100644
--- a/src/bin/keactrl/kea-netconf.conf.pre
+++ b/src/bin/keactrl/kea-netconf.conf.pre
@@ -71,6 +71,10 @@
                 // Any other value is considered a name of a time
                 "output": "@localstatedir@/log/kea-netconf.log"
 
+                // Shorter log pattern suitable for use with systemd,
+                // avoids redundant information
+                // "pattern": "%-5p %m\n"
+
                 // This governs whether the log output is flushed to disk after
                 // every write.
                 // "flush": false,