Commit 7bc4cc18 authored by Francis Dupont's avatar Francis Dupont

[208-move-logging-from-global-objects-to-global-params] Almost done. Checkpoint of the day

parent 259a69be
......@@ -8,8 +8,6 @@
\"command\": \"config-set\",
\"arguments\": {
\"<server>\": {
},
\"Logging\": {
}
}
}",
......
......@@ -8,8 +8,6 @@
\"command\": \"config-test\",
\"arguments\": {
\"<server>\": {
},
\"Logging\": {
}
}
}",
......
......@@ -20,12 +20,8 @@
"socket-type": "unix",
"socket-name": "/path/to/the/unix/socket-v4"
}
}
},
},
"Logging":
{
// In loggers
"loggers": [
{
......
......@@ -66,13 +66,9 @@
"param1": "foo"
}
}
]
},
],
// Similar to other Kea components, CA also uses logging.
"Logging":
{
// Similar to other Kea components, CA also uses logging.
"loggers": [
{
"name": "kea-ctrl-agent",
......
......@@ -49,10 +49,8 @@
"algorithm": "HMAC-MD5",
"secret": "LSWXnfkKZjdPJI5QxlpnfQ=="
}
]
},
],
"Logging": {
// In loggers
"loggers": [
{
......
......@@ -132,12 +132,10 @@
"digest-bits": 256,
"secret": "/4wklkm04jeH4anx2MKGJLcya+ZLHldL5d6mK+4q6UXQP7KJ9mS2QG29hh0SJR4LA0ikxNJTUMvir42gLx6fGQ=="
}
]
},
],
// The following configures logging. It assumes that messages with at least
// informational level (info, warn, error and fatal) should be logged to stdout.
"Logging": {
"loggers": [
{
"name": "kea-dhcp-ddns",
......
......@@ -172,14 +172,12 @@
"subnet": "192.0.5.0/24",
"authoritative": true
}
]
},
// The following configures logging. It assumes that messages with
// at least informational level (info, warn, error and fatal) should
// be logged to stdout.
"Logging": {
"loggers": [
],
// The following configures logging. It assumes that messages with
// at least informational level (info, warn, error and fatal) should
// be logged to stdout.
"loggers": [
{
"name": "kea-dhcp4",
"output_options": [
......
......@@ -790,12 +790,7 @@
"t1-percent": .5,
// T2 = valid lifetime * .75.
"t2-percent": .75
},
// Logging configuration begins here.
"Logging": {
"t2-percent": .75,
// List of loggers used by the servers using this configuration file.
"loggers": [
......
......@@ -691,12 +691,8 @@
// Queue type was mandatory.
"queue-type": "kea-ring4"
}
},
// Missing: calculate-tee-times, t1-percent, t2-percent
},
// Logging configuration begins here.
"Logging": {
// List of loggers used by the servers using this configuration file.
"loggers": [
......
......@@ -93,13 +93,11 @@
"subnet": "192.0.2.0/24",
"interface": "ethX"
}
]
},
],
// The following configures logging. It assumes that messages with at
// least informational level (info, warn, error and fatal) should be
// logged to stdout.
"Logging": {
"loggers": [
{
"name": "kea-dhcp4",
......
......@@ -100,13 +100,11 @@
"subnet": "192.0.2.0/24",
"interface": "ethX"
}
]
},
],
// The following configures logging. It assumes that messages with at
// least informational level (info, warn, error and fatal) should be
// logged to stdout.
"Logging": {
"loggers": [
{
"name": "kea-dhcp4",
......
......@@ -121,13 +121,11 @@
"subnet": "192.0.4.0/23",
"interface": "ethY"
}
]
},
],
// The following configures logging. It assumes that messages with at
// least informational level (info, warn, error and fatal) should be
// logged to stdout.
"Logging": {
"loggers": [
{
"name": "kea-dhcp4",
......
......@@ -153,13 +153,11 @@
{ "hw-address": "00:00:00:aa:bb:cc", "hostname": "ha" }
]
}
]
},
],
// The following configures logging. It assumes that messages with at
// least informational level (info, warn, error and fatal) should be
// logged to stdout.
"Logging": {
"loggers": [
{
"name": "kea-dhcp4",
......
......@@ -101,10 +101,8 @@
"dhcp-ddns": {
"comment": "No dynamic DNS",
"enable-updates": false
}
},
},
"Logging": {
// In loggers
"loggers": [ {
"comment": "A logger",
......
......@@ -27,12 +27,8 @@
],
// This enables DHCPv4-over-DHCPv6 support
"dhcp4o6-port": 6767
"dhcp4o6-port": 6767,
},
"Logging":
{
"loggers": [
{
"name": "kea-dhcp4",
......
......@@ -142,13 +142,11 @@
"subnet": "192.0.2.0/24",
"interface": "eth0"
}
]
},
],
// The following configures logging. It assumes that messages with at
// least informational level (info, warn, error and fatal) should be
// logged to stdout.
"Logging": {
"loggers": [
{
"name": "kea-dhcp4",
......
......@@ -192,13 +192,10 @@
// IP address.
"relay": { "ip-address": "192.168.56.1" }
}
]
},
],
// Logging configuration starts here.
"Logging":
{
"loggers": [
// Logging configuration starts here.
"loggers": [
{
// This section affects kea-dhcp4, which is the base logger for DHCPv4
// component. It tells DHCPv4 server to write all log messages (on
......
......@@ -48,13 +48,11 @@
"subnet": "192.0.2.0/24",
"interface": "ethX"
}
]
},
],
// The following configures logging. It assumes that messages with at
// least informational level (info, warn, error and fatal) should be
// logged to stdout.
"Logging": {
"loggers": [
{
"name": "kea-dhcp4",
......
......@@ -165,13 +165,11 @@
}
]
} ]
} ]
},
} ],
// The following configures logging. It assumes that messages with at
// least informational level (info, warn, error and fatal) should be
// logged to stdout.
"Logging": {
"loggers": [
{
"name": "kea-dhcp4",
......
......@@ -76,13 +76,11 @@
"interface": "ethX",
"id": 1
}
]
},
],
// The following configures logging. It assumes that messages with at
// least informational level (info, warn, error and fatal) should be
// logged to stdout.
"Logging": {
"loggers": [
{
"name": "kea-dhcp4",
......
......@@ -78,13 +78,11 @@
"interface": "ethX",
"id": 1
}
]
},
],
// The following configures logging. It assumes that messages with at
// least informational level (info, warn, error and fatal) should be
// logged to stdout.
"Logging": {
"loggers": [
{
"name": "kea-dhcp4",
......
......@@ -143,13 +143,11 @@
]
}
]
},
],
// The following configures logging. It assumes that messages with at
// least informational level (info, warn, error and fatal) should be
// logged to stdout.
"Logging": {
"loggers": [
{
"name": "kea-dhcp4",
......
......@@ -62,13 +62,11 @@
{
"pools": [ { "pool": "192.0.4.1 - 192.0.4.254" } ],
"subnet": "192.0.4.0/24"
} ]
},
} ],
// The following configures logging. It assumes that messages with at
// least informational level (info, warn, error and fatal) should be
// logged to stdout.
"Logging": {
"loggers": [
{
"name": "kea-dhcp4",
......
......@@ -37,14 +37,12 @@
"subnet": "192.0.2.0/24",
"interface": "ethX"
}
]
},
],
// The following configures logging. It assumes that messages with at
// least informational level (info, warn, error and fatal) should be
// logged to stdout. Alternatively, you can specify stderr here, a filename
// or 'syslog', which will store output messages via syslog.
"Logging": {
"loggers": [
{
"name": "kea-dhcp4",
......
......@@ -56,13 +56,11 @@
"qualifying-suffix" : "test.suffix.",
"hostname-char-set": "[^A-Za-z0-9.-]",
"hostname-char-replacement": "x"
}
},
},
// The following configures logging. It assumes that messages with at
// least informational level (info, warn, error and fatal) should be
// logged to stdout.
"Logging": {
"loggers": [
{
"name": "kea-dhcp4",
......
......@@ -155,13 +155,11 @@
"ip-address": "3000::1"
}
}
]
},
],
// The following configures logging. It assumes that messages with at
// least informational level (info, warn, error and fatal) should be
// logged to stdout.
"Logging": {
"loggers": [
{
"name": "kea-dhcp6",
......
......@@ -749,11 +749,7 @@
"t1-percent": .5,
// T2 = valid lifetime * .75.
"t2-percent": .75
},
// Logging configuration begins here.
"Logging": {
"t2-percent": .75,
// List of loggers used by the servers using this configuration file.
"loggers": [
......
......@@ -647,11 +647,7 @@
// Queue type was mandatory.
"queue-type": "kea-ring6"
}
},
// Logging configuration begins here.
"Logging": {
},
// List of loggers used by the servers using this configuration file.
"loggers": [
......
......@@ -94,13 +94,11 @@
"subnet": "2001:db8:1::/64",
"interface": "ethX"
}
]
},
],
// The following configures logging. It assumes that messages with at
// least informational level (info, warn, error and fatal) should be
// logged to stdout.
"Logging": {
"loggers": [
{
"name": "kea-dhcp6",
......
......@@ -100,13 +100,11 @@
"subnet": "2001:db8:1::/64",
"interface": "ethX"
}
]
},
],
// The following configures logging. It assumes that messages with at
// least informational level (info, warn, error and fatal) should be
// logged to stdout.
"Logging": {
"loggers": [
{
"name": "kea-dhcp6",
......
......@@ -88,13 +88,11 @@
"interface": "ethY"
}
]
},
],
// The following configures logging. It assumes that messages with at
// least informational level (info, warn, error and fatal) should be
// logged to stdout.
"Logging": {
"loggers": [
{
"name": "kea-dhcp6",
......
......@@ -124,13 +124,11 @@
]
}
]
},
],
// The following configures logging. It assumes that messages with at
// least informational level (info, warn, error and fatal) should be
// logged to stdout.
"Logging": {
"loggers": [
{
"name": "kea-dhcp6",
......
......@@ -111,10 +111,8 @@
"dhcp-ddns": {
"comment": "No dynamic DNS",
"enable-updates": false
}
},
},
"Logging": {
// In loggers
"loggers": [ {
"comment": "A logger",
......
......@@ -38,12 +38,9 @@
"csv-format": true,
// Put the server address here
"data": "2001:db8:1:1::1" }
]
},
],
"Logging":
{
"loggers": [
"loggers": [
{
"name": "kea-dhcp6",
"output_options": [
......
......@@ -58,12 +58,10 @@
"subnet": "2001:db8:1::/64",
"interface": "ethX"
}
]
},
],
// The following configures logging. It assumes that messages with at least
// informational level (info, warn, error) will will be logged to stdout.
"Logging": {
"loggers": [
{
"name": "kea-dhcp6",
......
......@@ -136,13 +136,11 @@
],
"interface": "ethX"
}
]
},
],
// The following configures logging. It assumes that messages with at
// least informational level (info, warn, error and fatal) should be
// logged to stdout.
"Logging": {
"loggers": [
{
"name": "kea-dhcp6",
......
......@@ -115,14 +115,12 @@
"interface": "ethX"
}
]
},
],
// The following configures logging. It assumes that messages with at
// least informational level (info, warn, error and fatal) should be
// logged to stdout. Alternatively, you can specify stderr here, a filename
// or 'syslog', which will store output messages via syslog.
"Logging": {
"loggers": [
{
"name": "kea-dhcp6",
......
......@@ -56,13 +56,11 @@
"subnet": "2001:db8:1::/64",
"interface": "ethX"
}
]
},