Skip to content
Snippets Groups Projects

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

Merged Only pass a metrics fd to the daemon child if a metrics address was specified
nick.thomas/gitlab-pages:fix-zero-fd into master
Merged Nick Thomas requested to merge nick.thomas/gitlab-pages:fix-zero-fd into master
Compare
and
1 file
+ 3
− 1
Compare changes
  • Side-by-side
  • Inline
daemon.go
+ 3
− 1
@@ -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 {