Jomaar/go-spamc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow to configure timeout

Browse Source
This commit is contained in:
Dolf Schimmel (Freeaqingme)
2015-11-24 19:01:47 +01:00
parent bf60dc83c5
commit cb8a8ab435
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client.go
View File

@@ -55,7 +55,6 @@ var SpamDError = map[int]string{
//Default parameters //Default parameters
const PROTOCOL_VERSION = "1.5" const PROTOCOL_VERSION = "1.5"
const DEFAULT_TIMEOUT = 10
//Command types //Command types
const CHECK = "CHECK" const CHECK = "CHECK"
@@ -91,7 +90,8 @@ const TABLE_MARK = "----"
//Types //Types
type Client struct { type Client struct {
ConnTimout float64 ConnectTimeout float64
Timout float64
ProtocolVersion string ProtocolVersion string
Host string Host string
User string User string
@@ -108,8 +108,8 @@ type SpamDOut struct {
type FnCallback func(*bufio.Reader) (*SpamDOut, error) type FnCallback func(*bufio.Reader) (*SpamDOut, error)
//new instance of Client //new instance of Client
func New(host string, timeout float64) *Client { func New(host string, timeout, connectTimeout float64) *Client {
return &Client{timeout, PROTOCOL_VERSION, host, ""} return &Client{connectTimeout, timeout, PROTOCOL_VERSION, host, ""}
} }
func (s *Client) SetUnixUser(user string) { func (s *Client) SetUnixUser(user string) {
@@ -265,14 +265,14 @@ func (s *Client) call(abort chan bool, cmd string, msgpars []string, onData FnCa
} }
// Create a new connection, with a reasonable timeout // Create a new connection, with a reasonable timeout
stream, err := net.DialTimeout("tcp", s.Host, time.Duration(DEFAULT_TIMEOUT)*time.Second) stream, err := net.DialTimeout("tcp", s.Host, time.Duration(s.ConnectTimeout)*time.Second)
if err != nil { if err != nil {
err = errors.New("Connection dial error to spamd: " + err.Error()) err = errors.New("Connection dial error to spamd: " + err.Error())
return return
} }
// Set connection timeout // Set connection timeout
timeout := time.Now().Add(time.Duration(s.ConnTimout) * time.Duration(time.Second)) timeout := time.Now().Add(time.Duration(s.Timout) * time.Second)
errTimeout := stream.SetDeadline(timeout) errTimeout := stream.SetDeadline(timeout)
if errTimeout != nil { if errTimeout != nil {
err = errors.New("Connection to spamd Timed Out:" + errTimeout.Error()) err = errors.New("Connection to spamd Timed Out:" + errTimeout.Error())