SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-155: Support overflowBehavior

Browse Source 
Resolves https://github.com/spring-cloud/spring-cloud-stream-binder-rabbit/issues/155

Add `overFlowBehavior` and `dlqOverflowBehavior` queue properties.

Resolves #158
This commit is contained in:
Gary Russell
2018-06-11 17:39:17 -04:00
committed by Oleg Zhurakousky
parent dd5c8c2dec
commit 95c2f7ee49
4 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spring-cloud-stream-binder-rabbit-core/src/main/java/org/springframework/cloud/stream/binder/rabbit/properties/RabbitCommonProperties.java
View File

@@ -164,6 +164,16 @@ public abstract class RabbitCommonProperties {
*/
private boolean dlqLazy;
/**
* action when maxLength or maxLengthBytes is exceeded
*/
private String overflowBehavior;
/**
* action when maxLength or maxLengthBytes is exceeded
*/
private String dlqOverflowBehavior;
public String getExchangeType() {
return this.exchangeType;
}
@@ -381,4 +391,20 @@ public abstract class RabbitCommonProperties {
this.dlqLazy = dlqLazy;
}
public String getOverflowBehavior() {
return this.overflowBehavior;
}
public void setOverflowBehavior(String overflowBehavior) {
this.overflowBehavior = overflowBehavior;
}
public String getDlqOverflowBehavior() {
return this.dlqOverflowBehavior;
}
public void setDlqOverflowBehavior(String dlqOverflowBehavior) {
this.dlqOverflowBehavior = dlqOverflowBehavior;
}
}

19
spring-cloud-stream-binder-rabbit-core/src/main/java/org/springframework/cloud/stream/binder/rabbit/provisioning/RabbitExchangeQueueProvisioner.java
View File

@@ -380,8 +380,6 @@ public class RabbitExchangeQueueProvisioner implements ApplicationListener<Decla
}
args.put("x-dead-letter-routing-key", dlRk);
}
additionalArgs(args, properties.getExpires(), properties.getMaxLength(), properties.getMaxLengthBytes(),
properties.getMaxPriority(), properties.getTtl(), properties.isLazy());
}
else {
if (properties.getDlqDeadLetterExchange() != null) {
@@ -390,15 +388,19 @@ public class RabbitExchangeQueueProvisioner implements ApplicationListener<Decla
if (properties.getDlqDeadLetterRoutingKey() != null) {
args.put("x-dead-letter-routing-key", properties.getDlqDeadLetterRoutingKey());
}
additionalArgs(args, properties.getDlqExpires(), properties.getDlqMaxLength(),
properties.getDlqMaxLengthBytes(), properties.getDlqMaxPriority(), properties.getDlqTtl(),
properties.isDlqLazy());
}
additionalArgs(args, properties, isDlq);
return args;
}
private void additionalArgs(Map<String, Object> args, Integer expires, Integer maxLength, Integer maxLengthBytes,
Integer maxPriority, Integer ttl, boolean lazy) {
private void additionalArgs(Map<String, Object> args, RabbitCommonProperties properties, boolean isDlq) {
Integer expires = isDlq ? properties.getDlqExpires() : properties.getExpires();
Integer maxLength = isDlq ? properties.getDlqMaxLength() : properties.getMaxLength();
Integer maxLengthBytes = isDlq ? properties.getDlqMaxLengthBytes() : properties.getMaxLengthBytes();
Integer maxPriority = isDlq ? properties.getDlqMaxPriority() : properties.getMaxPriority();
Integer ttl = isDlq ? properties.getDlqTtl() : properties.getTtl();
boolean lazy = isDlq ? properties.isDlqLazy() : properties.isLazy();
String overflow = isDlq ? properties.getDlqOverflowBehavior() : properties.getOverflowBehavior();
if (expires != null) {
args.put("x-expires", expires);
}
@@ -417,6 +419,9 @@ public class RabbitExchangeQueueProvisioner implements ApplicationListener<Decla
if (lazy) {
args.put("x-queue-mode", "lazy");
}
if (StringUtils.hasText(overflow)) {
args.put("x-overflow", overflow);
}
}