Skip to content

Commit 459ed29

Browse files
feat: bump golang up to 1.23
1 parent f85ca0b commit 459ed29

File tree

14 files changed

+85
-80
lines changed

14 files changed

+85
-80
lines changed

.devcontainer/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ version: "3"
88
services:
99
# Update this to the name of the service you want to work with in your docker-compose.yml file
1010
go:
11-
image: golang:1.22
11+
image: golang:1.23
1212
# If you want add a non-root user to your Dockerfile, you can use the "remoteUser"
1313
# property in devcontainer.json to cause VS Code its sub-processes (terminals, tasks,
1414
# debugging) to execute as the user. Uncomment the next line if you want the entire
@@ -44,7 +44,7 @@ services:
4444
depends_on:
4545
- passenger-app
4646
passenger-app:
47-
image: ghcr.io/rakutentech/passenger-go-exporter/passenger-app:6.0.20
47+
image: ghcr.io/rakutentech/passenger-go-exporter/passenger-app:6.0.23
4848
platform: linux/x86_64
4949
ports:
5050
- 3000:3000

.github/workflows/e2e.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
strategy:
1414
matrix:
1515
passenger-version:
16-
- 6.0.18
17-
- 6.0.19
18-
- 6.0.20
16+
- 6.0.21
17+
- 6.0.22
18+
- 6.0.23
1919
steps:
2020
- uses: actions/checkout@v4
2121
- uses: helm/kind-action@v1

.github/workflows/pull-request.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/checkout@v4
1616
- uses: actions/setup-go@v5
1717
with:
18-
go-version: '1.22'
18+
go-version: '1.23'
1919
cache: false
2020
- uses: actions/cache@v4
2121
with:
@@ -29,7 +29,7 @@ jobs:
2929
if: steps.cache.outputs.cache-hit != 'true'
3030
run: go mod download
3131
- name: build
32-
run: go build .
32+
run: go build .
3333
- name: test
3434
run: go test -json ./... > test.json
3535
- name: annotate tests
@@ -41,12 +41,12 @@ jobs:
4141
name: Lint
4242
strategy:
4343
matrix:
44-
go-version: [1.22]
44+
go-version: [1.23]
4545
runs-on: ubuntu-latest
4646
steps:
4747
- uses: actions/checkout@v4
4848
- uses: actions/setup-go@v5
4949
with:
50-
go-version: '1.22'
50+
go-version: '1.23'
5151
cache: false
52-
- uses: golangci/golangci-lint-action@v3
52+
- uses: golangci/golangci-lint-action@v6

.golangci.yaml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ run:
1717
# from this option's value (see skip-dirs-use-default).
1818
# "/" will be replaced by current OS file path separator to properly work
1919
# on Windows.
20-
skip-dirs:
20+
issues.exclude-dirs:
2121
- src/external_libs
2222
- autogenerated_by_my_lib
2323

2424
# output configuration options
2525
output:
2626
# colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number"
27-
format: line-number
27+
formats: line-number
2828

2929
# print lines of code with issue, default is true
3030
print-issued-lines: true
@@ -43,7 +43,7 @@ output:
4343

4444

4545
# all available settings of specific linters
46-
linters-settings:
46+
linters:
4747
errcheck:
4848
# report about not checking of errors in type assertions: `a := b.(MyStruct)`;
4949
# default is false: such cases aren't reported by default.
@@ -78,10 +78,8 @@ linters-settings:
7878
min-confidence: 0.8
7979
govet:
8080
# report about shadowed variables
81-
check-shadowing: true
82-
maligned:
83-
# print struct with more effective memory layout or not, false by default
84-
suggest-new: true
81+
shadow: true
82+
fieldalignment: true
8583
misspell:
8684
# Correct spellings using locale preferences for US or UK.
8785
# Default is to use a neutral variety of English.
@@ -96,8 +94,6 @@ linters-settings:
9694
enable:
9795
- asciicheck
9896
- misspell
99-
- maligned
100-
- golint
10197
- gofmt
10298
- gocyclo
10399
- gocritic

doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the MIT License.
33
// License that can be found in the LICENSE file.
44

5-
// Contained Promethues Component for monitoring Passenger application.
5+
// Contained Prometheus Component for monitoring Passenger application.
66
//
77
// If you want to know the metrics or so on, ,Please refer to the README.
88
package main

go.mod

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
module github.com/rakutentech/passenger-go-exporter
22

3-
go 1.22
3+
go 1.23.1
44

55
require (
6-
github.com/prometheus/client_golang v1.18.0
7-
github.com/prometheus/common v0.46.0
8-
github.com/stretchr/testify v1.8.0
9-
golang.org/x/net v0.21.0
10-
golang.org/x/sys v0.17.0 // indirect
6+
github.com/prometheus/client_golang v1.20.4
7+
github.com/prometheus/common v0.59.1
8+
github.com/stretchr/testify v1.9.0
9+
golang.org/x/net v0.29.0
10+
golang.org/x/sys v0.25.0 // indirect
1111
gopkg.in/yaml.v3 v3.0.1 // indirect
1212
)
1313

1414
require github.com/go-kit/log v0.2.1
1515

1616
require (
1717
github.com/beorn7/perks v1.0.1 // indirect
18-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
18+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
1919
github.com/davecgh/go-spew v1.1.1 // indirect
2020
github.com/go-logfmt/logfmt v0.6.0 // indirect
21+
github.com/klauspost/compress v1.17.9 // indirect
2122
github.com/kr/text v0.2.0 // indirect
23+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
2224
github.com/pmezard/go-difflib v1.0.0 // indirect
23-
github.com/prometheus/client_model v0.5.0 // indirect
24-
github.com/prometheus/procfs v0.12.0 // indirect
25-
golang.org/x/text v0.14.0 // indirect
26-
google.golang.org/protobuf v1.33.0 // indirect
25+
github.com/prometheus/client_model v0.6.1 // indirect
26+
github.com/prometheus/procfs v0.15.1 // indirect
27+
golang.org/x/text v0.18.0 // indirect
28+
google.golang.org/protobuf v1.34.2 // indirect
2729
)

go.sum

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,52 @@
11
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
22
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
3-
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
4-
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
3+
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
4+
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
55
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
6-
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
76
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
87
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
98
github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
109
github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
1110
github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
1211
github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
13-
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
14-
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
12+
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
13+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
14+
github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
15+
github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
1516
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
1617
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
1718
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
1819
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
20+
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
21+
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
22+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
23+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
1924
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
2025
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
21-
github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
22-
github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA=
23-
github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
24-
github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
25-
github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqScV0Y=
26-
github.com/prometheus/common v0.46.0/go.mod h1:Tp0qkxpb9Jsg54QMe+EAmqXkSV7Evdy1BTn+g2pa/hQ=
27-
github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
28-
github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
26+
github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI=
27+
github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
28+
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
29+
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
30+
github.com/prometheus/common v0.59.1 h1:LXb1quJHWm1P6wq/U824uxYi4Sg0oGvNeUm1z5dJoX0=
31+
github.com/prometheus/common v0.59.1/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0=
32+
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
33+
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
2934
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
3035
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
31-
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
32-
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
33-
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
34-
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
35-
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
36-
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
37-
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
38-
golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
39-
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
40-
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
41-
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
42-
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
43-
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
36+
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
37+
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
38+
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
39+
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
40+
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
41+
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
42+
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
43+
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
44+
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
45+
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
4446
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
4547
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
4648
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
4749
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
4850
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
49-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
5051
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
5152
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

logging/logger.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import (
1717
// https://godoc.org/github.com/prometheus/common/promlog/flag
1818
func NewLogger(logfmt string, loglevel string) log.Logger {
1919
promLogLevel := &promlog.AllowedLevel{}
20-
promLogLevel.Set(loglevel)
20+
_ = promLogLevel.Set(loglevel)
2121
promLogFormat := &promlog.AllowedFormat{}
22-
promLogFormat.Set(logfmt)
22+
_ = promLogFormat.Set(logfmt)
2323
promlogConfig := &promlog.Config{
2424
Level: promLogLevel,
2525
Format: promLogFormat,

main.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,28 +30,28 @@ func main() {
3030
logger := logging.NewLogger(*logfmt, *loglevel)
3131

3232
// Search passenge instance.
33-
level.Info(logger).Log(logging.Msg("Searching passenger instance."))
33+
_ = level.Info(logger).Log(logging.Msg("Searching passenger instance."))
3434
c := passenger.Context{}
3535
factory := passenger.CreateFactory(c)
3636
server := factory.FindInstance()
3737
for i := 0; i < 20; i++ {
3838
if server != nil {
3939
break
4040
}
41-
level.Info(logger).Log(logging.Msg("passenger not found. wait 200ms."))
41+
_ = level.Info(logger).Log(logging.Msg("passenger not found. wait 200ms."))
4242
time.Sleep(time.Millisecond * 200)
4343
server = factory.FindInstance()
4444
}
4545
if server == nil {
46-
level.Error(logger).Log(logging.Msg("passenger not found."))
46+
_ = level.Error(logger).Log(logging.Msg("passenger not found."))
4747
return
4848
}
49-
level.Info(logger).Log(logging.Msg("Found passenger instance."))
49+
_ = level.Info(logger).Log(logging.Msg("Found passenger instance."))
5050

5151
// Collector setup.
5252
collector := metric.NewCollector(server, logger)
5353
prometheus.MustRegister(collector)
54-
level.Info(logger).Log(logging.Msgf("Starting passenger-go-exporter[port %d]", *listenPort))
54+
_ = level.Info(logger).Log(logging.Msgf("Starting passenger-go-exporter[port %d]", *listenPort))
5555

5656
// HTTP Server setup.
5757
http.Handle("/metrics", promhttp.Handler())
@@ -64,6 +64,6 @@ func main() {
6464
})
6565
err := http.ListenAndServe(fmt.Sprintf(":%d", *listenPort), nil)
6666
if err != nil {
67-
level.Error(logger).Log(logging.Err(&err))
67+
_ = level.Error(logger).Log(logging.Err(&err))
6868
}
6969
}

main_test.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func TestRun(t *testing.T) {
2424
}
2525
os.Setenv("PASSENGER_INSTANCE_REGISTRY_DIR", "/sock")
2626

27-
statusc := make(chan string) //startup message channel.
27+
statusc := make(chan string) // startup message channel.
2828
runExporter(t, statusc)
2929

3030
callPassengerApp(t)
@@ -40,7 +40,7 @@ func TestRun(t *testing.T) {
4040
func TestRunNotFound(t *testing.T) {
4141
os.Setenv("PASSENGER_INSTANCE_REGISTRY_DIR", "/tmp")
4242

43-
statusc := make(chan string, 1) //startup message channel.
43+
statusc := make(chan string, 1) // startup message channel.
4444

4545
runExporter(t, statusc)
4646

@@ -116,11 +116,14 @@ func checkMetrics(t *testing.T, url string) {
116116

117117
if !existsProcessCount {
118118
t.Fatal("not found passenger_go_process_count")
119-
} else if !existsProcessProcessed {
119+
}
120+
if !existsProcessProcessed {
120121
t.Fatal("not found passenger_go_process_processed")
121-
} else if !existsProcessRealMemory {
122+
}
123+
if !existsProcessRealMemory {
122124
t.Fatal("not found passenger_go_process_real_memory")
123-
} else if !existsWaitListSie {
125+
}
126+
if !existsWaitListSie {
124127
t.Fatal("not found passenger_go_wait_list_size")
125128
}
126129
}

0 commit comments

Comments
 (0)