diff options
author | maxmeyer <dev@fedux.org> | 2018-03-13 20:45:12 +0300 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2018-03-13 20:45:12 +0300 |
commit | 9fd411b8251f47ee93018c9816dce63f7af49093 (patch) | |
tree | 8907da46ce6395ca6ba39cd78cf4c06ac4149e1a /main.go | |
parent | 62157ad75971bbc687ebf7990649a035820e4644 (diff) |
Add more logging to gitlab pages daemon
Diffstat (limited to 'main.go')
-rw-r--r-- | main.go | 47 |
1 files changed, 46 insertions, 1 deletions
@@ -32,6 +32,7 @@ var ( daemonUID = flag.Uint("daemon-uid", 0, "Drop privileges to this user") daemonGID = flag.Uint("daemon-gid", 0, "Drop privileges to this group") logFormat = flag.String("log-format", "text", "The log output format: 'text' or 'json'") + logVerbose = flag.Bool("log-verbose", false, "Verbose logging") disableCrossOriginRequests = flag.Bool("disable-cross-origin-requests", false, "Disable cross-origin requests") errArtifactSchemaUnsupported = errors.New("artifacts-server scheme must be either http:// or https://") @@ -47,6 +48,7 @@ func configFromFlags() appConfig { config.DisableCrossOriginRequests = *disableCrossOriginRequests config.StatusPath = *pagesStatus config.LogFormat = *logFormat + config.LogVerbose = *logVerbose if *pagesRootCert != "" { config.RootCertificate = readFile(*pagesRootCert) @@ -93,7 +95,7 @@ func appMain() { printVersion(*showVersion, VERSION) - configureLogging(*logFormat) + configureLogging(*logFormat, *logVerbose) log.WithFields(log.Fields{ "version": VERSION, @@ -108,27 +110,70 @@ func appMain() { config := configFromFlags() + log.WithFields(log.Fields{ + "artifacts-server": *artifactsServer, + "artifacts-server-timeout": *artifactsServerTimeout, + "daemon-gid": *daemonGID, + "daemon-uid": *daemonUID, + "default-config-filename": flag.DefaultConfigFlagname, + "disable-cross-origin-requests": *disableCrossOriginRequests, + "domain": config.Domain, + "listen-http": strings.Join(listenHTTP, ","), + "listen-https": strings.Join(listenHTTPS, ","), + "listen-proxy": strings.Join(listenProxy, ","), + "log-format": *logFormat, + "metrics-address": *metricsAddress, + "pages-domain": *pagesDomain, + "pages-root": *pagesRoot, + "pages-status": *pagesStatus, + "redirect-http": config.RedirectHTTP, + "root-cert": *pagesRootKey, + "root-key": *pagesRootCert, + "status_path": config.StatusPath, + "use-http-2": config.HTTP2, + }).Debug("Start daemon with configuration") + for _, addr := range listenHTTP.Split() { l, fd := createSocket(addr) defer l.Close() + + log.WithFields(log.Fields{ + "listener": addr, + }).Debug("Set up HTTP listener") + config.ListenHTTP = append(config.ListenHTTP, fd) } for _, addr := range listenHTTPS.Split() { l, fd := createSocket(addr) defer l.Close() + + log.WithFields(log.Fields{ + "listener": addr, + }).Debug("Set up HTTPS listener") + config.ListenHTTPS = append(config.ListenHTTPS, fd) } for _, addr := range listenProxy.Split() { l, fd := createSocket(addr) defer l.Close() + + log.WithFields(log.Fields{ + "listener": addr, + }).Debug("Set up proxy listener") + config.ListenProxy = append(config.ListenProxy, fd) } if *metricsAddress != "" { l, fd := createSocket(*metricsAddress) defer l.Close() + + log.WithFields(log.Fields{ + "listener": *metricsAddress, + }).Debug("Set up metrics listener") + config.ListenMetrics = fd } |