notifications: GetObjectInfo() later if bucket notifications are set. (#2575)

master
Harshavardhana 8 years ago committed by GitHub
parent d9bd73f4e8
commit 2f9975c76c
  1. 4
      cmd/bucket-handlers.go
  2. 4
      cmd/object-handlers.go

@ -360,10 +360,13 @@ func (api objectAPIHandlers) PostPolicyBucketHandler(w http.ResponseWriter, r *h
ETag: md5Sum, ETag: md5Sum,
}) })
// Set common headers.
setCommonHeaders(w) setCommonHeaders(w)
// Write successful response.
writeSuccessResponse(w, encodedSuccessResponse) writeSuccessResponse(w, encodedSuccessResponse)
if eventN.IsBucketNotificationSet(bucket) {
// Fetch object info for notifications. // Fetch object info for notifications.
objInfo, err := api.ObjectAPI.GetObjectInfo(bucket, object) objInfo, err := api.ObjectAPI.GetObjectInfo(bucket, object)
if err != nil { if err != nil {
@ -371,7 +374,6 @@ func (api objectAPIHandlers) PostPolicyBucketHandler(w http.ResponseWriter, r *h
return return
} }
if eventN.IsBucketNotificationSet(bucket) {
// Notify object created event. // Notify object created event.
eventNotify(eventData{ eventNotify(eventData{
Type: ObjectCreatedPost, Type: ObjectCreatedPost,

@ -454,6 +454,7 @@ func (api objectAPIHandlers) PutObjectHandler(w http.ResponseWriter, r *http.Req
} }
writeSuccessResponse(w, nil) writeSuccessResponse(w, nil)
if eventN.IsBucketNotificationSet(bucket) {
// Fetch object info for notifications. // Fetch object info for notifications.
objInfo, err := api.ObjectAPI.GetObjectInfo(bucket, object) objInfo, err := api.ObjectAPI.GetObjectInfo(bucket, object)
if err != nil { if err != nil {
@ -461,7 +462,6 @@ func (api objectAPIHandlers) PutObjectHandler(w http.ResponseWriter, r *http.Req
return return
} }
if eventN.IsBucketNotificationSet(bucket) {
// Notify object created event. // Notify object created event.
eventNotify(eventData{ eventNotify(eventData{
Type: ObjectCreatedPut, Type: ObjectCreatedPut,
@ -795,6 +795,7 @@ func (api objectAPIHandlers) CompleteMultipartUploadHandler(w http.ResponseWrite
w.Write(encodedSuccessResponse) w.Write(encodedSuccessResponse)
w.(http.Flusher).Flush() w.(http.Flusher).Flush()
if eventN.IsBucketNotificationSet(bucket) {
// Fetch object info for notifications. // Fetch object info for notifications.
objInfo, err := api.ObjectAPI.GetObjectInfo(bucket, object) objInfo, err := api.ObjectAPI.GetObjectInfo(bucket, object)
if err != nil { if err != nil {
@ -802,7 +803,6 @@ func (api objectAPIHandlers) CompleteMultipartUploadHandler(w http.ResponseWrite
return return
} }
if eventN.IsBucketNotificationSet(bucket) {
// Notify object created event. // Notify object created event.
eventNotify(eventData{ eventNotify(eventData{
Type: ObjectCreatedCompleteMultipartUpload, Type: ObjectCreatedCompleteMultipartUpload,

Loading…
Cancel
Save