gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into messaging

Browse Source
This commit is contained in:
chrislu
2022-07-06 02:55:13 -07:00
parent cc51c7582f 69ef6459c3
commit e7843b4127
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
weed/replication/sub/notification_gocdk_pub_sub.go
View File

@@ -46,17 +46,17 @@ func QueueDeclareAndBind(conn *amqp.Connection, exchangeUrl string, queueUrl str
} }
defer ch.Close() defer ch.Close()
if err := ch.ExchangeDeclare( 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) glog.Error(err)
return err return err
} }
if err := ch.ExchangeDeclare( 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) glog.Error(err)
return err return err
} }
if _, err := ch.QueueDeclare( if _, err := ch.QueueDeclare(
queueName, false, false, false, false, queueName, true, false, false, false,
amqp.Table{"x-dead-letter-exchange": exchangeNameDLX}); err != nil { amqp.Table{"x-dead-letter-exchange": exchangeNameDLX}); err != nil {
glog.Error(err) glog.Error(err)
return err return err
@@ -66,7 +66,7 @@ func QueueDeclareAndBind(conn *amqp.Connection, exchangeUrl string, queueUrl str
return err return err
} }
if _, err := ch.QueueDeclare( 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 { amqp.Table{"x-dead-letter-exchange": exchangeName, "x-message-ttl": 600000}); err != nil {
glog.Error(err) glog.Error(err)
return err return err

2
weed/s3api/s3api_objects_list_handlers.go
View File

@@ -281,7 +281,7 @@ func (s3a *S3ApiServer) doListFilerEntries(client filer_pb.SeaweedFilerClient, d
request := &filer_pb.ListEntriesRequest{ request := &filer_pb.ListEntriesRequest{
Directory: dir, Directory: dir,
Prefix: prefix, Prefix: prefix,
Limit: uint32(maxKeys + 1), Limit: uint32(maxKeys + 2), // bucket root directory needs to skip additional s3_constants.MultipartUploadsFolder folder
StartFromFileName: marker, StartFromFileName: marker,
InclusiveStartFrom: inclusiveStartFrom, InclusiveStartFrom: inclusiveStartFrom,
} }