瀏覽代碼

Merge pull request #21613 from wzyboy/support-unixgram-syslog-address

Support unixgram syslog address
Brian Goff 9 年之前
父節點
當前提交
dbee44c9e0
共有 4 個文件被更改,包括 5 次插入3 次删除
  1. 2 2
      daemon/logger/syslog/syslog.go
  2. 1 0
      docs/admin/logging/overview.md
  3. 1 1
      pkg/urlutil/urlutil.go
  4. 1 0
      pkg/urlutil/urlutil_test.go

+ 2 - 2
daemon/logger/syslog/syslog.go

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

+ 1 - 0
docs/admin/logging/overview.md

@@ -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=unix://path
+    --log-opt syslog-address=unixgram://path
     --log-opt syslog-facility=daemon
     --log-opt syslog-tls-ca-cert=/etc/ca-certificates/custom/ca.pem
     --log-opt syslog-tls-cert=/etc/ca-certificates/custom/cert.pem

+ 1 - 1
pkg/urlutil/urlutil.go

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

+ 1 - 0
pkg/urlutil/urlutil_test.go

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