Merge ac5026b into 11b69ab

.travis.yml

@@ -25,8 +25,8 @@ env:
   global:
   - S3CMD_ZIP=master.zip
   - S3CMD_URL=https://github.com/s3tools/s3cmd/archive
-  - HELM_URL=https://storage.googleapis.com/kubernetes-helm
-  - HELM_TGZ=helm-v2.4.1-linux-amd64.tar.gz
+  - HELM_URL=https://get.helm.sh
+  - HELM_TGZ=helm-v2.17.0-linux-amd64.tar.gz
   - secure: DgyQ0pT+P+aMj3iCshPiHmG7sDx95QVC3Qq+ITD2769dz1Sep6Bvz99emLM84b5g1V3aT7hvjg+RE/A8yrpCHZfuiNeiNY5XQR58zaKcShoRmYxyuSJPLUxbu12AVrbaQJFbwEs5evc2BDHBAN1+YTaEGIkAeEfAjyw4DpxZZNm8NHB5JHSKuZmcdoPz7ASdysenLzWxon/fxRB5nXVK2Jky/+0uFhMpJPJhvpQBE0SLrZ6L9mSduIehcrnl/qvJnVIWZDkMb1qRgSDZ3rXSFk05T1bZtbeQXQRWcz2AtHfvmhR51ufsfI7tZ/n65U/J40hq8OcSLjJyA4GOy0Xt7Vai0pjOyv5XBvwyCqTcl1ptm3Yf5aW75kiCsMlBGXv8dK8vI7IY4iXLPnipSKVK1UkgCfSQNRsHlf0vJ21k/7KRAZnhmtS39WcVapOed/UoXIWDgMH5PcrnkuZPylLONlHSE5pbevnObHsRGh86YSAxx0RS+RXJ2qlF6l8QYT5S0TDDHtpJ9qlJHpD6jJCMm9/0txTBgMDfaksmFLVnEEKhZrWW/lDk8YCDNz+Sb2Pq1cBRXzi2+i10b21XS4pYBbxyNecanwxNtr8Bia7yQbJHZF1zByUz4IaMA1pX7B2XGA46gDpav6edKWtN9es/HBxH8FgH7EG1dECjGBNXlw8=
   - secure: No6skbtjA8gQKB/Z6cOAgyPMIJ4yt++yCo0JRQxEeKHP4sTK8gdZ2Xpt0Lk6XXQcBfpz2IG06hsfGkMznnKIdcCh2IT1Y4Iwj7U2k5fAgRoWxGWNi9EGms08fRaW6DEHxAEI1dqpw8GSpDZsiHM4ZlM32QYu25/v1lVDOSCwbGmKq85FctIlxpuiUdZwrM4FY9AzI3x5tcYMUGiVsVdl+kEVcphImurLuzxDSBXH1/tb5dRYDv4Qo6bfnj5kIWDNPpEH1sK8jddjQ46BP13Ad9KAhNPcIvx6oerMvHiZ9VKFzYuo0fety9Ax/jxZdppNSvs3PtbM9slR1qKOlOSyYS00nTH5j+xvhygurJ9ffcmbZFqeFLI7rEHcT8BYGGZgK6Hb4nbuqp6julWndfpcjqntxCThKp5/z74aZn1jPshVh+0Zud48ne9kHpAqwReW8MsKVPAObzGIUcZypdQt6TYb4AvJtvea81Z9KB2jleBDOC7YggbMGKE/5PjfQREry39ba6WVCOv0b4tgDjAdlIP2/XPJ34CS69YF5dC8dVAegJ+PzTNEwPwXbGywRxuU9SoXHS+V6YswcEhRvNYgpL3vmzj6tmM3oOOg/fX0vtWddguN8romoGHCJbYnNjEMvP10x6tcZSBxz5DzxWhGfBnnpNxtqmvfm0aKw7azbD0=
   - secure: G8sM4Xqxuj27/MlmKPJq2REfogZh3aDgOWoY3nJ8bd6hQHmdisnRYCyC9t5PDkBJMZKTA0YYO4WossrTAoYrHXUN4iB1Kq/np8xM5N22D85LG3t2asMw9ft8fHAtrC5IHN3UFxFU1w3o/2zKGjpskPHvBKcIKeNG+QgQrxwPjYCyNj7ELfXvqesoocD8C7pkLgZw3jVOo/hpp2L9wVaniKIYKKO4ecYuIomlZUntorx98hD+ZmV7bkW5zQYvvPBhZOGB/KYJb58tkavGE4fFp6sgmhiC96BLRd9SLmye6tLTeT0HOHg7A7Hg8XHWz1U19TL+B0desrt65o06FyunN3DB+eJXQEVYujfP0x/n9LEucf1U6Cb/idgA73ZvHapthkLeG14yXqL/8r/kYqwS8Q9pNMmykZjhY81KmpQyKuOM1uyxD5K/avh2yi/KtvU1WEjWudJOWDw8AoLGUpnFd0c+nQQBMhX3GG9B3jGLqzIjX1Fe1sYELAgQYQgumyosNf1GBG3IaLbmeQ8I+qdZt0+QmLLIZl2KmG2vuQmDDFDIYTnLg/0KEzUsjfNoG+fl4qZfHnNme5ZpkY5FlgNTnIQ8HharrTYFMaj33l3MCn7cNZKLTKIPOtzLsjdbIHmSjiSHd5w/At2iil7tUjpPvisr2oRFDywEXsG98EkXUN0=

api/room_handler.go

@@ -234,7 +234,7 @@ func (g *RoomEventHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if resp.Code != 200 {
+	if resp != nil && resp.Code != 200 {
 		err := errors.New(resp.Message)
 		logger.WithError(err).Error("Room event forward failed.")
 		g.App.HandleError(w, resp.Code, "room event forward failed", err)

eventforwarder/forward.go

@@ -257,6 +257,10 @@ func ForwardEventToForwarders(
 		}
 	}
 
+	if respCode == 0 {
+		return nil, nil, nil
+	}
+
 	resp = &Response{
 		Code:    respCode,
 		Message: strings.Join(respMessage, ";"),

eventforwarder/forward_test.go

@@ -323,8 +323,7 @@ forwarders:
 			)
 
 			Expect(err).NotTo(HaveOccurred())
-			Expect(response.Code).To(Equal(0))
-			Expect(response.Message).To(Equal(""))
+			Expect(response).To(BeNil())
 		})
 
 		It("should return as success but report error if forward fails", func() {
@@ -454,7 +453,7 @@ game: game
 
 			mockReporter.EXPECT().Report(reportersConstants.EventRPCDuration, gomock.Any())
 
-			response, err := ForwardPlayerEvent(
+			_, err := ForwardPlayerEvent(
 				ctx,
 				mockForwarders,
 				mockDB,
@@ -467,7 +466,6 @@ game: game
 			)
 
 			Expect(err).NotTo(HaveOccurred())
-			Expect(response).NotTo(BeNil())
 		})
 
 		It("should report fail if event forward fails", func() {