Merge branch 'master' into 'master'

email changes

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

config.yaml

 couchdb:
     port: '5984'
-    host: 0.0.0.0
+    host: bpapi_default
     username: root
     password: root
 curl:
-    check_mail: http://root:root@0.0.0.0:5984/outbox/_all_docs/?limit=1 #http://root:root@0.0.0.0:5984/outbox/_all_docs/?limit=1
-    get_outbox_mail: http://root:root@0.0.0.0:5984/outbox/
-    delete_outbox_mail: http://root:root@0.0.0.0:5984/outbox/
-    add_sent_mail: http://root:root@0.0.0.0:5984/sentitems/
-    add_mail_log: http://root:root@0.0.0.0:5984/mail_logs/
+    check_mail: http://root:root@bpapi_default:5984/outbox/_all_docs/?limit=1 #http://root:root@0.0.0.0:5984/outbox/_all_docs/?limit=1
+    get_outbox_mail: http://root:root@bpapi_default:5984/outbox/
+    delete_outbox_mail: http://root:root@bpapi_default:5984/outbox/
+    add_sent_mail: http://root:root@bpapi_default:5984/sentitems/
+    add_mail_log: http://root:root@bpapi_default:5984/mail_logs/
 protocols:
     method: http://
 requests:

worker.go

@@ -139,15 +139,18 @@ func main() {
 			 */
 			req, reqErr := http.NewRequest(config.Requests.Get, config.Curl.CheckMail, nil)
 			//req, reqErr := http.NewRequest("GET", "http://root:root@0.0.0.0:5984/outbox/_all_docs/?limit=1", nil)
-			req.Header.Set(config.Requests.HeaderType, config.Requests.HeaderJson)
-			resp, respErr := http.DefaultClient.Do(req)
 			if reqErr != nil {
 				alert := " Error creating request to OUTBOX DB \n" + reqErr.Error()
 				alertAdmin(alert)
+				panic(reqErr)
 			}
+			req.Header.Set(config.Requests.HeaderType, config.Requests.HeaderJson)
+
+			resp, respErr := http.DefaultClient.Do(req)
 			if respErr != nil {
 				alert := " Error in getting email from the OUTBOX DB \n" + respErr.Error()
 				alertAdmin(alert)
+				panic(respErr)
 			}
 			defer resp.Body.Close()
 			respbody, _ := ioutil.ReadAll(resp.Body)