Browse code

Merge pull request #11545 from cpuguy83/remove_allocator_warning

Don't warn when ip_local_port_range not found

Jessie Frazelle authored on 2015/03/24 06:19:57
Showing 1 changed files
... ...
@@ -79,10 +79,11 @@ func NewErrPortAlreadyAllocated(ip string, port int) ErrPortAlreadyAllocated {
79 79
 
80 80
 func init() {
81 81
 	const portRangeKernelParam = "/proc/sys/net/ipv4/ip_local_port_range"
82
+	portRangeFallback := fmt.Sprintf("using fallback port range %d-%d", beginPortRange, endPortRange)
82 83
 
83 84
 	file, err := os.Open(portRangeKernelParam)
84 85
 	if err != nil {
85
-		log.Warnf("Failed to read %s kernel parameter: %v", portRangeKernelParam, err)
86
+		log.Warnf("port allocator - %s due to error: %v", portRangeFallback, err)
86 87
 		return
87 88
 	}
88 89
 	var start, end int
... ...
@@ -91,7 +92,7 @@ func init() {
91 91
 		if err == nil {
92 92
 			err = fmt.Errorf("unexpected count of parsed numbers (%d)", n)
93 93
 		}
94
-		log.Errorf("Failed to parse port range from %s: %v", portRangeKernelParam, err)
94
+		log.Errorf("port allocator - failed to parse system ephemeral port range from %s - %s: %v", portRangeKernelParam, portRangeFallback, err)
95 95
 		return
96 96
 	}
97 97
 	beginPortRange = start