From d44e9d6da98f3eb6183863a0c475321d7d933886 Mon Sep 17 00:00:00 2001 From: Aditya Manthramurthy Date: Wed, 9 Nov 2016 02:47:44 -0500 Subject: [PATCH] Prevent weird messages from rpc lib on start (Fixes #3209): (#3212) This is done by not making the methods of the BucketMetaState interface as methods (via type nesting) on the type implementing RPCs (s3PeerAPIHandlers). --- cmd/s3-peer-router.go | 2 +- cmd/s3-peer-rpc-handlers.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/s3-peer-router.go b/cmd/s3-peer-router.go index 4d54f64ee..f86a76d7a 100644 --- a/cmd/s3-peer-router.go +++ b/cmd/s3-peer-router.go @@ -27,7 +27,7 @@ const ( ) type s3PeerAPIHandlers struct { - *localBMS + bms BucketMetaState } func registerS3PeerRPCRouter(mux *router.Router) error { diff --git a/cmd/s3-peer-rpc-handlers.go b/cmd/s3-peer-rpc-handlers.go index 7eb85722d..9985d9971 100644 --- a/cmd/s3-peer-rpc-handlers.go +++ b/cmd/s3-peer-rpc-handlers.go @@ -54,7 +54,7 @@ func (s3 *s3PeerAPIHandlers) SetBucketNotificationPeer(args *SetBNPArgs, reply * return errInvalidToken } - return s3.UpdateBucketNotification(args) + return s3.bms.UpdateBucketNotification(args) } // SetBLPArgs - Arguments collection to SetBucketListenerPeer RPC call @@ -74,7 +74,7 @@ func (s3 *s3PeerAPIHandlers) SetBucketListenerPeer(args *SetBLPArgs, reply *Gene return errInvalidToken } - return s3.UpdateBucketListener(args) + return s3.bms.UpdateBucketListener(args) } // EventArgs - Arguments collection for Event RPC call @@ -96,7 +96,7 @@ func (s3 *s3PeerAPIHandlers) Event(args *EventArgs, reply *GenericReply) error { return errInvalidToken } - return s3.SendEvent(args) + return s3.bms.SendEvent(args) } // SetBPPArgs - Arguments collection for SetBucketPolicyPeer RPC call @@ -117,5 +117,5 @@ func (s3 *s3PeerAPIHandlers) SetBucketPolicyPeer(args *SetBPPArgs, reply *Generi return errInvalidToken } - return s3.UpdateBucketPolicy(args) + return s3.bms.UpdateBucketPolicy(args) }