improve SendRequest func and fix some bugs (#8)

znats/request.go

@@ -6,30 +6,29 @@ import (
 	"time"
 )
 
-const RequestRetries = 5
-
-func (c *ComponentNats) SendRequest(topic *Topic, data []byte, timeout time.Duration) (error, []byte) {
+func (c *ComponentNats) SendRequest(topic *Topic, data []byte, reqRetry int, reqTimeout time.Duration, waitInterval time.Duration) (error, []byte) {
 	var out []byte
-	for i := 0; i < RequestRetries; i++ {
-		response, err := c.NatsConn.Request(topic.FullRoute(), data, timeout)
+	for i := 0; i < reqRetry; i++ {
+		response, err := c.NatsConn.Request(topic.FullRoute(), data, reqTimeout)
 
 		if err != nil {
 			if err == nats.ErrTimeout {
 				zap.S().Errorf("Request to topic '%s' timeout, retrying...", topic.FullRoute())
-				time.Sleep(5 * time.Second)
+				time.Sleep(waitInterval)
 				continue
 			} else {
 				return err, nil
 			}
 		}
 
 		out = response.Data
+		break
 	}
 
 	return nil, out
 }
 
-func (c *ComponentNats) WaitTopicAndSendRequest(topic *Topic, data []byte, timeout time.Duration) (error, []byte) {
+func (c *ComponentNats) WaitTopicAndSendRequest(topic *Topic, data []byte, reqRetry int, reqTimeout time.Duration, sleepInterval time.Duration) (error, []byte) {
 	c.WaitForTopicToExist(topic)
-	return c.SendRequest(topic, data, timeout)
+	return c.SendRequest(topic, data, reqRetry, reqTimeout, sleepInterval)
 }