use go mod

Author: iwind

.gitattributes

@@ -0,0 +1,3 @@
+module github.com/iwind/gofcgi
+
+go 1.16

go.mod

@@ -1,4 +1,4 @@
-package gofcgi
+package pkg
 
 import (
 	"errors"
@@ -38,12 +38,12 @@ func NewClient(network string, address string) *Client {
 		expireTime:  time.Now().Add(86400 * time.Second),
 	}
 
-	// 处理超时
+	// deal with expireTime
 	go func() {
 		for {
 			time.Sleep(1 * time.Second)
 			if time.Since(client.expireTime) > 0 {
-				client.conn.Close()
+				_ = client.conn.Close()
 
 				client.expireLocker.Lock()
 				client.expireTime = time.Now().Add(86400 * time.Second)
@@ -77,7 +77,7 @@ func (this *Client) Call(req *Request) (resp *http.Response, stderr []byte, err
 
 	defer func() {
 		if this.mock {
-			time.Sleep(1 * time.Second) // 模拟占用连接
+			time.Sleep(1 * time.Second)
 		}
 		this.isFree = true
 		this.locker.Unlock()
@@ -93,12 +93,12 @@ func (this *Client) Call(req *Request) (resp *http.Response, stderr []byte, err
 	resp, stderr, err = req.CallOn(this.conn)
 	this.endTime()
 
-	// 如果失去连接，则重新连接
+	// if lost connection, retry
 	if err != nil {
 		log.Println("[gofcgi]" + err.Error())
 
 		if err == ErrClientDisconnect {
-			// 重试一次
+			// retry again
 			this.Close()
 			err = this.Connect()
 			if err == nil {
@@ -120,15 +120,15 @@ func (this *Client) Call(req *Request) (resp *http.Response, stderr []byte, err
 func (this *Client) Close() {
 	this.isAvailable = false
 	if this.conn != nil {
-		this.conn.Close()
+		_ = this.conn.Close()
 	}
 	this.conn = nil
 }
 
 func (this *Client) Connect() error {
 	this.isAvailable = false
 
-	// @TODO 设置并使用超时时间
+	// @TODO set timeout
 	conn, err := net.Dial(this.network, this.address)
 	if err != nil {
 		log.Println("[gofcgi]" + err.Error())

client.go pkg/client.goclient.go renamed to pkg/client.go

@@ -1,4 +1,4 @@
-package gofcgi
+package pkg
 
 import (
 	"bytes"

client_test.go pkg/client_test.goclient_test.go renamed to pkg/client_test.go

@@ -1,6 +1,6 @@
-package gofcgi
+package pkg
 
-// 参考 http://www.mit.edu/~yandros/doc/specs/fcgi-spec.html
+// referer: http://www.mit.edu/~yandros/doc/specs/fcgi-spec.html
 
 const (
 	// Listening socket file number

const.go pkg/const.goconst.go renamed to pkg/const.go

@@ -1,4 +1,4 @@
-package gofcgi
+package pkg
 
 type Header struct {
 	Version       byte

header.go pkg/header.goheader.go renamed to pkg/header.go

@@ -1,4 +1,4 @@
-package gofcgi
+package pkg
 
 type NameValuePair struct {
 	NameLength  uint16

name_value.go pkg/name_value.goname_value.go renamed to pkg/name_value.go

@@ -1,4 +1,4 @@
-package gofcgi
+package pkg
 
 import (
 	"errors"
@@ -39,7 +39,7 @@ func SharedPool(network string, address string, size uint) *Pool {
 		client := NewClient(network, address)
 		client.KeepAlive()
 
-		// 第一个同步连接供使用，其余的可以异步建立连接
+		// prepare one for first request, and left for async request
 		if i == 0 {
 			err := client.Connect()
 			if err != nil {
@@ -56,13 +56,13 @@ func SharedPool(network string, address string, size uint) *Pool {
 		pool.clients = append(pool.clients, client)
 	}
 
-	// 监控连接
+	// watch connections
 	go func() {
-		for {
-			time.Sleep(10 * time.Second)
+		ticker := time.NewTicker(10 * time.Second)
+		for range ticker.C {
 			for _, client := range pool.clients {
 				if !client.isAvailable {
-					client.Connect()
+					_ = client.Connect()
 				}
 			}
 		}

pool.go pkg/pool.gopool.go renamed to pkg/pool.go

@@ -1,18 +1,18 @@
-package gofcgi
+package pkg
 
 import (
-	"testing"
-	"time"
 	"errors"
 	"io/ioutil"
+	"testing"
+	"time"
 )
 
 func TestSharedPool(t *testing.T) {
 	pool := SharedPool("tcp", "127.0.0.1:9000", 8)
 
 	time.Sleep(100 * time.Millisecond)
 
-	for i := 0; i < 3; i ++ {
+	for i := 0; i < 3; i++ {
 		go func() {
 			client, err := pool.Client()
 			if err != nil {
@@ -41,7 +41,7 @@ func TestSharedPool(t *testing.T) {
 				"REQUEST_METHOD": "GET",
 			})
 
-			resp, err := client.Call(req)
+			resp, _, err := client.Call(req)
 			if err != nil {
 				t.Log(err.Error())
 			} else {

pool_test.go pkg/pool_test.gopool_test.go renamed to pkg/pool_test.go

@@ -1,4 +1,4 @@
-package gofcgi
+package pkg
 
 type UnknownTypeBody struct {
 	recordType byte