Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modify variable names and Optimize methods #871

Merged
merged 1 commit into from
Jun 27, 2019
Merged

Modify variable names and Optimize methods #871

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 12 additions & 19 deletions sentinel-core/src/main/java/com/alibaba/csp/sentinel/slotchain/SlotChainProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,9 @@
*/
package com.alibaba.csp.sentinel.slotchain;

import java.util.ArrayList;
import java.util.List;
import java.util.ServiceLoader;

import com.alibaba.csp.sentinel.log.RecordLog;
import com.alibaba.csp.sentinel.slots.DefaultSlotChainBuilder;
import java.util.ServiceLoader;

/**
* A provider for creating slot chains via resolved slot chain builder SPI.
Expand All @@ -30,7 +27,7 @@
*/
public final class SlotChainProvider {

private static volatile SlotChainBuilder builder = null;
private static volatile SlotChainBuilder slotChainBuilder = null;

private static final ServiceLoader<SlotChainBuilder> LOADER = ServiceLoader.load(SlotChainBuilder.class);

Expand All @@ -41,37 +38,33 @@ public final class SlotChainProvider {
* @return new created slot chain
*/
public static ProcessorSlotChain newSlotChain() {
if (builder != null) {
return builder.build();
if (slotChainBuilder != null) {
return slotChainBuilder.build();
}

resolveSlotChainBuilder();

if (builder == null) {
if (slotChainBuilder == null) {
RecordLog.warn("[SlotChainProvider] Wrong state when resolving slot chain builder, using default");
builder = new DefaultSlotChainBuilder();
slotChainBuilder = new DefaultSlotChainBuilder();
}
return builder.build();
return slotChainBuilder.build();
}

private static void resolveSlotChainBuilder() {
List<SlotChainBuilder> list = new ArrayList<SlotChainBuilder>();
boolean hasOther = false;
for (SlotChainBuilder builder : LOADER) {
if (builder.getClass() != DefaultSlotChainBuilder.class) {
hasOther = true;
list.add(builder);
slotChainBuilder = builder;
break;
}
}
if (hasOther) {
builder = list.get(0);
} else {
if (slotChainBuilder == null){
// No custom builder, using default.
builder = new DefaultSlotChainBuilder();
slotChainBuilder = new DefaultSlotChainBuilder();
}

RecordLog.info("[SlotChainProvider] Global slot chain builder resolved: "
+ builder.getClass().getCanonicalName());
+ slotChainBuilder.getClass().getCanonicalName());
}

private SlotChainProvider() {}
Expand Down