Merge branch 'master' into 'master'

context added to MG send function

See merge request stephan-parkwaylabs/go-email-worker!1

worker.go

@@ -9,6 +9,7 @@ package main
  * 		- ./<file_name>
  */
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -318,7 +319,9 @@ func worker(i int) {
 			if len(cc) > 0 {
 				message.AddCC(cc)
 			}
-			MailgunResp, id, err := mg.Send(message)
+			ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
+			defer cancel()
+			MailgunResp, id, err := mg.Send(ctx, message)
 			if err != nil {
 				log.Fatal(err)
 				//alertAdmin(" MAilgun Error \n" + err.Error())
@@ -367,7 +370,9 @@ func sendMessage(mg mailgun.Mailgun, sender, subject, body, recipient, cc string
 	 * Add CC if cc recipiants are available
 	 */
 	if len(cc) > 0 {
-		message.AddCC(cc)
+		ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
+		defer cancel()
+		message.AddCC(ctx, cc)
 	}
 	resp, id, err := mg.Send(message)
 	if err != nil {