diff options
| author | Félix Sipma <felix+debian@gueux.org> | 2018-01-05 11:09:43 +0100 |
|---|---|---|
| committer | Félix Sipma <felix+debian@gueux.org> | 2018-01-05 11:09:43 +0100 |
| commit | 2e53196f9027ebb270b9e9a251ad39383a500c8f (patch) | |
| tree | 833d20440bfb8baa3995877e4af8ff90765d08f4 /api-notification.go | |
| parent | c7638802ac6c5efbe71dd2a58181ded9b52b8f32 (diff) | |
New upstream version 4.0.5
Diffstat (limited to 'api-notification.go')
| -rw-r--r-- | api-notification.go | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/api-notification.go b/api-notification.go index 25a283a..3f5b30a 100644 --- a/api-notification.go +++ b/api-notification.go @@ -1,5 +1,6 @@ /* - * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2016 Minio, Inc. + * Minio Go Library for Amazon S3 Compatible Cloud Storage + * Copyright 2017 Minio, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +19,7 @@ package minio import ( "bufio" + "context" "encoding/json" "io" "net/http" @@ -46,10 +48,10 @@ func (c Client) getBucketNotification(bucketName string) (BucketNotification, er urlValues.Set("notification", "") // Execute GET on bucket to list objects. - resp, err := c.executeMethod("GET", requestMetadata{ - bucketName: bucketName, - queryValues: urlValues, - contentSHA256Bytes: emptySHA256, + resp, err := c.executeMethod(context.Background(), "GET", requestMetadata{ + bucketName: bucketName, + queryValues: urlValues, + contentSHA256Hex: emptySHA256Hex, }) defer closeResponse(resp) @@ -150,7 +152,7 @@ func (c Client) ListenBucketNotification(bucketName, prefix, suffix string, even // Check ARN partition to verify if listening bucket is supported if s3utils.IsAmazonEndpoint(c.endpointURL) || s3utils.IsGoogleEndpoint(c.endpointURL) { notificationInfoCh <- NotificationInfo{ - Err: ErrAPINotSupported("Listening bucket notification is specific only to `minio` partitions"), + Err: ErrAPINotSupported("Listening for bucket notification is specific only to `minio` server endpoints"), } return } @@ -170,13 +172,16 @@ func (c Client) ListenBucketNotification(bucketName, prefix, suffix string, even urlValues["events"] = events // Execute GET on bucket to list objects. - resp, err := c.executeMethod("GET", requestMetadata{ - bucketName: bucketName, - queryValues: urlValues, - contentSHA256Bytes: emptySHA256, + resp, err := c.executeMethod(context.Background(), "GET", requestMetadata{ + bucketName: bucketName, + queryValues: urlValues, + contentSHA256Hex: emptySHA256Hex, }) if err != nil { - continue + notificationInfoCh <- NotificationInfo{ + Err: err, + } + return } // Validate http response, upon error return quickly. |