From 29e6848e925fda2b51dc7e6e3ce1ac3e7eb3b1d6 Mon Sep 17 00:00:00 2001
From: Alexander Holodov <alexander.holodov@vereign.com>
Date: Tue, 12 Mar 2019 09:59:11 +0300
Subject: [PATCH] 11 fix panic
---
handler/handler.go | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/handler/handler.go b/handler/handler.go
index 5babaa4..c64f5b9 100644
--- a/handler/handler.go
+++ b/handler/handler.go
@@ -93,7 +93,13 @@ func (s *KeyStorageServerImpl) GetKey(ctx context.Context, in *api.GetKeyRequest
return getKeyResponse, nil
}
- data, _ := client.DoGetDataCall("keys", in.Uuid+"/"+api.KeyType.String(in.KeyType))
+ data, err := client.DoGetDataCall("keys", in.Uuid+"/"+api.KeyType.String(in.KeyType))
+ if err != nil {
+ getKeyResponse.Key = nil
+ getKeyResponse.StatusList = utils.AddStatus(getKeyResponse.StatusList,
+ "500", api.StatusType_ERROR, err.Error())
+ return getKeyResponse, nil
+ }
if data.Errors != "" {
getKeyResponse.Key = nil
@@ -128,7 +134,12 @@ func (s *KeyStorageServerImpl) SetKey(ctx context.Context, in *api.SetKeyRequest
return setKeyResponse, nil
}
- data, _ := client.DoGetDataCall("keys", in.Uuid+"/"+api.KeyType.String(in.KeyType))
+ data, err := client.DoGetDataCall("keys", in.Uuid+"/"+api.KeyType.String(in.KeyType))
+ if err != nil {
+ setKeyResponse.StatusList = utils.AddStatus(setKeyResponse.StatusList,
+ "500", api.StatusType_ERROR, err.Error())
+ return setKeyResponse, nil
+ }
if data.Errors != "" {
setKeyResponse.StatusList = utils.AddStatus(setKeyResponse.StatusList,
--
GitLab