Merge branch 'fix-zero-fd' into 'master'

Only pass a metrics fd to the daemon child if a metrics address was specified

Closes gitlab-ce#28581

See merge request !18

1 files changed, 3 insertions, 1 deletions

diff --git a/daemon.go b/daemon.go
index 84ca7c15..8d68bb44 100644
--- a/daemon.go
+++ b/daemon.go
@@ -205,7 +205,9 @@ func daemonize(config appConfig, uid, gid uint) {
 	daemonUpdateFds(cmd, config.ListenHTTP)
 	daemonUpdateFds(cmd, config.ListenHTTPS)
 	daemonUpdateFds(cmd, config.ListenProxy)
-	config.ListenMetrics = daemonUpdateFd(cmd, config.ListenMetrics)
+	if config.ListenMetrics != 0 {
+		config.ListenMetrics = daemonUpdateFd(cmd, config.ListenMetrics)
+	}
 
 	// Start the process
 	if err = cmd.Start(); err != nil {