kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Support unixgram syslog address

Browse source 
- Consider unixgram:// as a valid URL prefix
- Parse unixgram:// addresses
- Update docs

Signed-off-by: Zhuoyun Wei <wzyboy@wzyboy.org>
This commit is contained in:
Zhuoyun Wei 2016-03-29 18:21:41 +08:00
parent 78076d5cf9
commit 57fad95e43
No known key found for this signature in database
GPG key ID: AE9C22168EBA0BDB
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/logger/syslog/syslog.go
View file

@ -152,8 +152,8 @@ func parseAddress(address string) (string, string, error) {
return "", "", err return "", "", err
} }
// unix socket validation // unix and unixgram socket validation
if url.Scheme == "unix" { if url.Scheme == "unix" || url.Scheme == "unixgram" {
if _, err := os.Stat(url.Path); err != nil { if _, err := os.Stat(url.Path); err != nil {
return "", "", err return "", "", err
} }

1
docs/admin/logging/overview.md
View file

@ -74,6 +74,7 @@ The following logging options are supported for the `syslog` logging driver:
--log-opt syslog-address=[tcp|udp|tcp+tls]://host:port --log-opt syslog-address=[tcp|udp|tcp+tls]://host:port
--log-opt syslog-address=unix://path --log-opt syslog-address=unix://path
--log-opt syslog-address=unixgram://path
--log-opt syslog-facility=daemon --log-opt syslog-facility=daemon
--log-opt syslog-tls-ca-cert=/etc/ca-certificates/custom/ca.pem --log-opt syslog-tls-ca-cert=/etc/ca-certificates/custom/ca.pem
--log-opt syslog-tls-cert=/etc/ca-certificates/custom/cert.pem --log-opt syslog-tls-cert=/etc/ca-certificates/custom/cert.pem

2
pkg/urlutil/urlutil.go
View file

@ -11,7 +11,7 @@ var (
validPrefixes = map[string][]string{ validPrefixes = map[string][]string{
"url": {"http://", "https://"}, "url": {"http://", "https://"},
"git": {"git://", "github.com/", "git@"}, "git": {"git://", "github.com/", "git@"},
"transport": {"tcp://", "tcp+tls://", "udp://", "unix://"}, "transport": {"tcp://", "tcp+tls://", "udp://", "unix://", "unixgram://"},
} }
urlPathWithFragmentSuffix = regexp.MustCompile(".git(?:#.+)?$") urlPathWithFragmentSuffix = regexp.MustCompile(".git(?:#.+)?$")
) )

1
pkg/urlutil/urlutil_test.go
View file

@ -23,6 +23,7 @@ var (
"tcp+tls://example.com", "tcp+tls://example.com",
"udp://example.com", "udp://example.com",
"unix:///example", "unix:///example",
"unixgram:///example",
} }
) )