From 733fb9a934da33e3984dabeb8282694014f4372b Mon Sep 17 00:00:00 2001 From: Robert Landers Date: Wed, 25 Sep 2024 19:51:21 +0200 Subject: [PATCH] address feedback --- frankenphp.go | 3 ++- metrics.go | 15 ++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/frankenphp.go b/frankenphp.go index ed9aea3e4..b83b509fb 100644 --- a/frankenphp.go +++ b/frankenphp.go @@ -276,6 +276,7 @@ func calculateMaxThreads(opt *opt) error { metrics.TotalThreads(opt.numThreads) MaxThreads = opt.numThreads + return nil } @@ -475,7 +476,7 @@ func ServeHTTP(responseWriter http.ResponseWriter, request *http.Request) error fc.responseWriter = responseWriter fc.startedAt = time.Now() - isWorker := nil == fc.responseWriter + isWorker := fc.responseWriter == nil isWorkerRequest := false rc := requestChan diff --git a/metrics.go b/metrics.go index f48d1e2cf..3b0832370 100644 --- a/metrics.go +++ b/metrics.go @@ -12,20 +12,21 @@ var metricsNameRegex = regexp.MustCompile(`\W+`) var metricsNameFixRegex = regexp.MustCompile(`^_+|_+$`) type Metrics interface { - // StartWorker Collects started workers + // StartWorker collects started workers StartWorker(name string) - // StopWorker Collects stopped workers + // StopWorker collects stopped workers StopWorker(name string) - // TotalWorkers Collects expected workers + // TotalWorkers collects expected workers TotalWorkers(name string, num int) - // TotalThreads Collects total threads + // TotalThreads collects total threads TotalThreads(num int) - // StartRequest Collects started requests + // StartRequest collects started requests StartRequest() - // StopRequest Collects stopped requests + // StopRequest collects stopped requests StopRequest() - // StopWorkerRequest Collects stopped worker requests + // StopWorkerRequest collects stopped worker requests StopWorkerRequest(name string, duration time.Duration) + // StartWorkerRequest collects started worker requests StartWorkerRequest(name string) Shutdown() }