diff options
| author | chrislu <chris.lu@gmail.com> | 2022-07-06 02:55:13 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-07-06 02:55:13 -0700 |
| commit | e7843b412713de26acf80b75fac1ff7403a0b717 (patch) | |
| tree | e4449f4807c74c5667f0c5e1039deb0321ae1879 /weed | |
| parent | cc51c7582f1bcdb1c3f5f7099f2676ddf19a2b22 (diff) | |
| parent | 69ef6459c30a9146e815ba0d04fd59f8d9eabdc4 (diff) | |
| download | seaweedfs-e7843b412713de26acf80b75fac1ff7403a0b717.tar.xz seaweedfs-e7843b412713de26acf80b75fac1ff7403a0b717.zip | |
Merge branch 'master' into messaging
Diffstat (limited to 'weed')
| -rw-r--r-- | weed/replication/sub/notification_gocdk_pub_sub.go | 8 | ||||
| -rw-r--r-- | weed/s3api/s3api_objects_list_handlers.go | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/weed/replication/sub/notification_gocdk_pub_sub.go b/weed/replication/sub/notification_gocdk_pub_sub.go index cb690e3ce..ad4031190 100644 --- a/weed/replication/sub/notification_gocdk_pub_sub.go +++ b/weed/replication/sub/notification_gocdk_pub_sub.go @@ -46,17 +46,17 @@ func QueueDeclareAndBind(conn *amqp.Connection, exchangeUrl string, queueUrl str } defer ch.Close() if err := ch.ExchangeDeclare( - exchangeNameDLX, "fanout", false, false, false, false, nil); err != nil { + exchangeNameDLX, "fanout", true, false, false, false, nil); err != nil { glog.Error(err) return err } if err := ch.ExchangeDeclare( - exchangeName, "fanout", false, false, false, false, nil); err != nil { + exchangeName, "fanout", true, false, false, false, nil); err != nil { glog.Error(err) return err } if _, err := ch.QueueDeclare( - queueName, false, false, false, false, + queueName, true, false, false, false, amqp.Table{"x-dead-letter-exchange": exchangeNameDLX}); err != nil { glog.Error(err) return err @@ -66,7 +66,7 @@ func QueueDeclareAndBind(conn *amqp.Connection, exchangeUrl string, queueUrl str return err } if _, err := ch.QueueDeclare( - queueNameDLX, false, false, false, false, + queueNameDLX, true, false, false, false, amqp.Table{"x-dead-letter-exchange": exchangeName, "x-message-ttl": 600000}); err != nil { glog.Error(err) return err diff --git a/weed/s3api/s3api_objects_list_handlers.go b/weed/s3api/s3api_objects_list_handlers.go index 1c55f97ac..e55802937 100644 --- a/weed/s3api/s3api_objects_list_handlers.go +++ b/weed/s3api/s3api_objects_list_handlers.go @@ -281,7 +281,7 @@ func (s3a *S3ApiServer) doListFilerEntries(client filer_pb.SeaweedFilerClient, d request := &filer_pb.ListEntriesRequest{ Directory: dir, Prefix: prefix, - Limit: uint32(maxKeys + 1), + Limit: uint32(maxKeys + 2), // bucket root directory needs to skip additional s3_constants.MultipartUploadsFolder folder StartFromFileName: marker, InclusiveStartFrom: inclusiveStartFrom, } |