fix(inputs.phpfpm): Avoid blocking forever on FCGI protocol

Use the timeout of php-fpm with fgci protocol

Signed-off-by: Pierre Fersing <[email protected]>

plugins/inputs/phpfpm/fcgi_client.go

@@ -6,10 +6,11 @@ import (
 	"net"
 	"strconv"
 	"strings"
+	"time"
 )
 
 // Create an fcgi client
-func newFcgiClient(h string, args ...interface{}) (*conn, error) {
+func newFcgiClient(timeout time.Duration, h string, args ...interface{}) (*conn, error) {
 	var con net.Conn
 	if len(args) != 1 {
 		return nil, errors.New("fcgi: not enough params")
@@ -19,13 +20,24 @@ func newFcgiClient(h string, args ...interface{}) (*conn, error) {
 	switch args[0].(type) {
 	case int:
 		addr := h + ":" + strconv.FormatInt(int64(args[0].(int)), 10)
-		con, err = net.Dial("tcp", addr)
+		if timeout == 0 {
+			con, err = net.Dial("tcp", addr)
+		} else {
+			con, err = net.DialTimeout("tcp", addr, timeout)
+		}
 	case string:
 		laddr := net.UnixAddr{Name: args[0].(string), Net: h}
 		con, err = net.DialUnix(h, nil, &laddr)
 	default:
 		err = errors.New("fcgi: we only accept int (port) or string (socket) params")
 	}
+
+	if timeout != 0 {
+		if err := con.SetDeadline(time.Now().Add(timeout)); err != nil {
+			return nil, err
+		}
+	}
+
 	fcgi := &conn{
 		rwc: con,
 	}

plugins/inputs/phpfpm/phpfpm.go

@@ -159,7 +159,7 @@ func (p *phpfpm) gatherServer(addr string, acc telegraf.Accumulator) error {
 		}
 		fcgiIP := socketAddr[0]
 		fcgiPort, _ := strconv.Atoi(socketAddr[1])
-		fcgi, err = newFcgiClient(fcgiIP, fcgiPort)
+		fcgi, err = newFcgiClient(time.Duration(p.Timeout), fcgiIP, fcgiPort)
 		if err != nil {
 			return err
 		}
@@ -173,7 +173,7 @@ func (p *phpfpm) gatherServer(addr string, acc telegraf.Accumulator) error {
 		if statusPath == "" {
 			statusPath = "status"
 		}
-		fcgi, err = newFcgiClient("unix", socketPath)
+		fcgi, err = newFcgiClient(time.Duration(p.Timeout), "unix", socketPath)
 	}
 
 	if err != nil {