go.d phpfpm switch to github.com/kanocz/fcgi_client (#17784)
Ilya Mashchenko committed
May 30, 2024 at 13:37 UTC
80a8513af767a99950f08cbf8c0dd7ae436b0189
3 files changed
+9
-4
src/go/collectors/go.d.plugin/go.mod
+1
-1
@@ -28,6 +28,7 @@ require (
28
github.com/ilyam8/hashstructure v1.1.0
29
github.com/jackc/pgx/v4 v4.18.3
30
github.com/jessevdk/go-flags v1.5.0
31
+ github.com/kanocz/fcgi_client v0.0.0-20210113082628-fff85c8adfb7
32
github.com/likexian/whois v1.15.3
33
github.com/likexian/whois-parser v1.24.16
34
github.com/lmittmann/tint v1.0.4
@@ -41,7 +42,6 @@ require (
42
github.com/prometheus/prometheus v2.5.0+incompatible
43
github.com/stretchr/testify v1.9.0
44
github.com/tidwall/gjson v1.17.1
44
- github.com/tomasen/fcgi_client v0.0.0-20180423082037-2bb3d819fd19
45
github.com/valyala/fastjson v1.6.4
46
github.com/vmware/govmomi v0.37.2
47
go.mongodb.org/mongo-driver v1.15.0
src/go/collectors/go.d.plugin/go.sum
+2
-2
@@ -195,6 +195,8 @@ github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtL
195
github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
196
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
197
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
198
+github.com/kanocz/fcgi_client v0.0.0-20210113082628-fff85c8adfb7 h1:W0fAsQ7bC1db4k9O2X6yZvatz/0c/ISyxhmNnc6arZA=
199
+github.com/kanocz/fcgi_client v0.0.0-20210113082628-fff85c8adfb7/go.mod h1:dHpIS7C6YjFguh5vo9QBVEojDoL3vh3v6oEho2HtNyA=
200
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
201
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
202
github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE=
@@ -338,8 +340,6 @@ github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
340
github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
341
github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
342
github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
341
-github.com/tomasen/fcgi_client v0.0.0-20180423082037-2bb3d819fd19 h1:ZCmSnT6CLGhfoQ2lPEhL4nsJstKDCw1F1RfN8/smTCU=
342
-github.com/tomasen/fcgi_client v0.0.0-20180423082037-2bb3d819fd19/go.mod h1:SXTY+QvI+KTTKXQdg0zZ7nx0u94QWh8ZAwBQYsW9cqk=
343
github.com/valyala/fastjson v1.6.4 h1:uAUNq9Z6ymTgGhcm0UynUAB6tlbakBrz6CQFax3BXVQ=
344
github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=
345
github.com/vmware/govmomi v0.37.2 h1:5ANLoaTxWv600ZnoosJ2zXbM3A+EaxqGheEZbRN8YVE=
src/go/collectors/go.d.plugin/modules/phpfpm/client.go
+6
-1
@@ -13,7 +13,7 @@ import (
13
14
"github.com/netdata/netdata/go/go.d.plugin/pkg/web"
15
16
- fcgiclient "github.com/tomasen/fcgi_client"
16
+ fcgiclient "github.com/kanocz/fcgi_client"
17
)
18
19
type (
@@ -128,6 +128,10 @@ func (c *socketClient) getStatus() (*status, error) {
128
}
129
defer socket.Close()
130
131
+ if err := socket.SetTimeout(c.timeout); err != nil {
132
+ return nil, fmt.Errorf("error on setting socket timeout: %v", err)
133
+ }
134
+
135
resp, err := socket.Get(c.env)
136
if err != nil {
137
return nil, fmt.Errorf("error on getting data from socket '%s': %v", c.socket, err)
@@ -142,6 +146,7 @@ func (c *socketClient) getStatus() (*status, error) {
146
if err := json.Unmarshal(content, st); err != nil {
147
return nil, fmt.Errorf("error on decoding response from socket '%s': %v", c.socket, err)
148
}
149
+
150
return st, nil
151
}
152