Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app.go
diff options
context:
space:
mode:
authorKrasimir Angelov <kangelov@gitlab.com>2019-10-07 06:12:02 +0300
committerKrasimir Angelov <kangelov@gitlab.com>2019-10-07 06:12:02 +0300
commitf640b99697b6f6bb9c9ed2919bab3f1ee0d1c4e2 (patch)
tree0f81aae0a295097ac2eef9580bb72442449399d2 /app.go
parentfa804e9f422cb1525324e917a4b318bea8596067 (diff)
Remove unused Admin gRPC API
It was ever used. See gitlab-org/omnibus-gitlab/merge_requests/3444#note_194217889 for more details. Done as part of https://gitlab.com/gitlab-org/gitlab/issues/28781.
Diffstat (limited to 'app.go')
-rw-r--r--app.go58
1 files changed, 0 insertions, 58 deletions
diff --git a/app.go b/app.go
index e9130467..09bf039e 100644
--- a/app.go
+++ b/app.go
@@ -3,10 +3,8 @@ package main
import (
"crypto/tls"
"errors"
- "fmt"
"net"
"net/http"
- "os"
"sync"
"github.com/prometheus/client_golang/prometheus/promhttp"
@@ -17,7 +15,6 @@ import (
mimedb "gitlab.com/lupine/go-mimedb"
"gitlab.com/gitlab-org/gitlab-pages/internal/acme"
- "gitlab.com/gitlab-org/gitlab-pages/internal/admin"
"gitlab.com/gitlab-org/gitlab-pages/internal/artifact"
"gitlab.com/gitlab-org/gitlab-pages/internal/auth"
headerConfig "gitlab.com/gitlab-org/gitlab-pages/internal/config"
@@ -351,9 +348,6 @@ func (a *theApp) Run() {
a.listenMetricsFD(&wg, a.ListenMetrics)
}
- a.listenAdminUnix(&wg)
- a.listenAdminHTTPS(&wg)
-
a.domains.Watch(a.Domain)
wg.Wait()
@@ -408,58 +402,6 @@ func (a *theApp) listenMetricsFD(wg *sync.WaitGroup, fd uintptr) {
}()
}
-func (a *theApp) listenAdminUnix(wg *sync.WaitGroup) {
- fd := a.ListenAdminUnix
- if fd == 0 {
- return
- }
-
- wg.Add(1)
- go func() {
- defer wg.Done()
-
- l, err := net.FileListener(os.NewFile(fd, "[admin-socket-unix]"))
- if err != nil {
- errortracking.Capture(err, errortracking.WithField("listener", "admin unix socket"))
- fatal(fmt.Errorf("failed to listen on FD %d: %v", fd, err))
- }
- defer l.Close()
-
- if err := admin.NewServer(string(a.AdminToken)).Serve(l); err != nil {
- fatal(err)
- }
- }()
-}
-
-func (a *theApp) listenAdminHTTPS(wg *sync.WaitGroup) {
- fd := a.ListenAdminHTTPS
- if fd == 0 {
- return
- }
-
- cert, err := tls.X509KeyPair(a.AdminCertificate, a.AdminKey)
- if err != nil {
- capturingFatal(err)
- }
-
- wg.Add(1)
- go func() {
- defer wg.Done()
-
- l, err := net.FileListener(os.NewFile(fd, "[admin-socket-https]"))
- if err != nil {
- errMsg := fmt.Errorf("failed to listen on FD %d: %v", fd, err)
- log.WithError(errMsg).Error("error")
- capturingFatal(err, errortracking.WithField("listener", "admin https socket"))
- }
- defer l.Close()
-
- if err := admin.NewTLSServer(string(a.AdminToken), &cert).Serve(l); err != nil {
- fatal(err)
- }
- }()
-}
-
func runApp(config appConfig) {
a := theApp{appConfig: config, domains: source.NewDomains()}