fix issue openpitrix#79 openpitrix#74 openpitrix#75 openpitrix#80

huojiao2006 · Aug 5, 2019 · cc2a8a7 · cc2a8a7
1 parent 6d19436
commit cc2a8a7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -57,8 +57,7 @@ type Config struct {
 	}
 
 	Websocket struct {
-		//Service string `default:"op,ks"`
-		Service string `default:"none"`
+		Service string `default:"op,ks"`
 	}
 }
 

diff --git a/pkg/services/notification/handler.go b/pkg/services/notification/handler.go
@@ -404,7 +404,7 @@ func (s *Server) DeleteAddresses(ctx context.Context, req *pb.DeleteAddressesReq
 	err := rs.DeleteAddresses(ctx, addressIds)
 	if err != nil {
 		logger.Errorf(ctx, "Failed to delete addresses [%+v], %+v.", addressIds, err)
-		return nil, gerr.NewWithDetail(ctx, gerr.Internal, err, gerr.ErrorNotExistAddrInList, addressIds)
+		return nil, gerr.NewWithDetail(ctx, gerr.Internal, err, gerr.ErrorDeleteResourceFailed, addressIds)
 	}
 
 	logger.Debugf(ctx, "Delete addresses [%+v] successfully.", addressIds)