Skip to content
Snippets Groups Projects
Commit 2f97f06e authored by Nick Thomas's avatar Nick Thomas
Browse files

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
parents c13e845a 8b38fc78
No related branches found
No related tags found
1 merge request!18Only pass a metrics fd to the daemon child if a metrics address was specified
Pipeline #
Loading
Loading
@@ -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 {
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment