chore: Rename agent statistics server to http api server (#5961)

This commit is contained in:
Mathias Fredriksson
2023-02-01 20:05:57 +02:00
committed by GitHub
parent f9ae105a26
commit e6f5623627
4 changed files with 31 additions and 33 deletions
+8 -8
View File
@@ -526,23 +526,23 @@ func (a *agent) createTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) (_
return nil, err
}
statisticsListener, err := network.Listen("tcp", ":"+strconv.Itoa(codersdk.WorkspaceAgentStatisticsPort))
apiListener, err := network.Listen("tcp", ":"+strconv.Itoa(codersdk.WorkspaceAgentHTTPAPIServerPort))
if err != nil {
return nil, xerrors.Errorf("listen for statistics: %w", err)
return nil, xerrors.Errorf("api listener: %w", err)
}
defer func() {
if err != nil {
_ = statisticsListener.Close()
_ = apiListener.Close()
}
}()
if err = a.trackConnGoroutine(func() {
defer statisticsListener.Close()
defer apiListener.Close()
server := &http.Server{
Handler: a.statisticsHandler(),
Handler: a.apiHandler(),
ReadTimeout: 20 * time.Second,
ReadHeaderTimeout: 20 * time.Second,
WriteTimeout: 20 * time.Second,
ErrorLog: slog.Stdlib(ctx, a.logger.Named("statistics_http_server"), slog.LevelInfo),
ErrorLog: slog.Stdlib(ctx, a.logger.Named("http_api_server"), slog.LevelInfo),
}
go func() {
select {
@@ -552,9 +552,9 @@ func (a *agent) createTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) (_
_ = server.Close()
}()
err := server.Serve(statisticsListener)
err := server.Serve(apiListener)
if err != nil && !xerrors.Is(err, http.ErrServerClosed) && !strings.Contains(err.Error(), "use of closed network connection") {
a.logger.Critical(ctx, "serve statistics HTTP server", slog.Error(err))
a.logger.Critical(ctx, "serve HTTP API server", slog.Error(err))
}
}); err != nil {
return nil, err
+1 -1
View File
@@ -11,7 +11,7 @@ import (
"github.com/coder/coder/codersdk"
)
func (*agent) statisticsHandler() http.Handler {
func (*agent) apiHandler() http.Handler {
r := chi.NewRouter()
r.Get("/", func(rw http.ResponseWriter, r *http.Request) {
httpapi.Write(r.Context(), rw, http.StatusOK, codersdk.Response{