Skip to content

Changed net.Dial to net.DialTimeout to allow adding a reasonable time… #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
peterkellydev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changed net.Dial to net.DialTimeout to allow adding a reasonable time… #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func (s *Client) Process(msgpars ...string) (reply *SpamDOut, err error) {
return s.simpleCall(PROCESS, msgpars)
}

//Same as PROCESS, but return only modified headers, not body (new in protocol 1.4)
//Same as PROCESS, but return only modified headers, not body (new in protocol 1.4)
func (s *Client) Headers(msgpars ...string) (reply *SpamDOut, err error) {
return s.simpleCall(HEADERS, msgpars)
}
Expand Down Expand Up @@ -263,8 +263,8 @@ func (s *Client) call(cmd string, msgpars []string, onData FnCallback, extraHead
cmd = REPORT
}

// Create a new connection
stream, err := net.Dial("tcp", s.Host)
// Create a new connection, with a reasonable timeout
stream, err := net.DialTimeout("tcp", s.Host, time.Duration(DEFAULT_TIMEOUT)*time.Second)

if err != nil {
err = errors.New("Connection dial error to spamd: " + err.Error())
Expand Down Expand Up @@ -317,7 +317,7 @@ func processResponse(cmd string, data *bufio.Reader) (returnObj *SpamDOut, err e
var result = r.FindStringSubmatch(lineStr)
if len(result) < 4 {
if cmd != "SKIP" {
err = errors.New("spamd unreconized reply:" + lineStr)
err = errors.New("spamd unrecognized reply:" + lineStr)
} else {
returnObj.Code = EX_OK
returnObj.Message = "SKIPPED"
Expand Down