crabapples
/
Sentinel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Polish SpiLoader and SentinelConfig 

Signed-off-by: Eric Zhao <sczyh16@gmail.com>
This commit is contained in:
Eric Zhao 2021-02-04 14:36:11 +08:00
parent fefd8c4826
commit 33570dad40
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sentinel-core/src/main/java/com/alibaba/csp/sentinel/config/SentinelConfig.java
View File

@ -167,6 +167,7 @@ public final class SentinelConfig {
/** /**
* Get the metric log flush interval in second * Get the metric log flush interval in second
* @return the metric log flush interval in second * @return the metric log flush interval in second
* @since 1.8.1
*/ */
public static long metricLogFlushIntervalSec() { public static long metricLogFlushIntervalSec() {
String flushIntervalStr = SentinelConfig.getConfig(METRIC_FLUSH_INTERVAL); String flushIntervalStr = SentinelConfig.getConfig(METRIC_FLUSH_INTERVAL);

25
sentinel-core/src/main/java/com/alibaba/csp/sentinel/spi/SpiLoader.java
View File

@ -23,12 +23,13 @@ import com.alibaba.csp.sentinel.util.StringUtil;
import java.io.*; import java.io.*;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.net.URL; import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
/** /**
* A simple SPI loading facility. * A simple SPI loading facility (refactored since 1.8.1).
* *
* <p>SPI is short for Service Provider Interface.</p> * <p>SPI is short for Service Provider Interface.</p>
* *
@ -54,13 +55,14 @@ import java.util.concurrent.atomic.AtomicBoolean;
* 3. The comment line character is #, all characters following it are ignored. * 3. The comment line character is #, all characters following it are ignored.
* </p> * </p>
* *
* <p> *
* Provide common functions, such as: * <p>{@code SpiLoader} provide common functions, such as:</p>
* Load all Provider instance unsorted/sorted list. * <ul>
* Load highest/lowest order priority instance. * <li>Load all Provider instance unsorted/sorted list.</li>
* Load first-found or default instance. * <li>Load highest/lowest order priority instance.</li>
* Load instance by aliasname or provider class. * <li>Load first-found or default instance.</li>
* </p> * <li>Load instance by alias name or provider class.</li>
* </ul>
* *
* @author Eric Zhao * @author Eric Zhao
* @author cdfive * @author cdfive
@ -92,7 +94,7 @@ public final class SpiLoader<S> {
// Cache the singleton instance of Provider, key: classname of Provider, value: Provider instance // Cache the singleton instance of Provider, key: classname of Provider, value: Provider instance
private final ConcurrentHashMap<String, S> singletonMap = new ConcurrentHashMap<>(); private final ConcurrentHashMap<String, S> singletonMap = new ConcurrentHashMap<>();
// Whether this SpiLoader has beend loaded, that is, loaded the Provider configuration file // Whether this SpiLoader has been loaded, that is, loaded the Provider configuration file
private final AtomicBoolean loaded = new AtomicBoolean(false); private final AtomicBoolean loaded = new AtomicBoolean(false);
// Default provider class // Default provider class
@ -342,7 +344,7 @@ public final class SpiLoader<S> {
BufferedReader br = null; BufferedReader br = null;
try { try {
in = url.openStream(); in = url.openStream();
br = new BufferedReader(new InputStreamReader(in, "utf-8")); br = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
String line; String line;
while ((line = br.readLine()) != null) { while ((line = br.readLine()) != null) {
if (StringUtil.isBlank(line)) { if (StringUtil.isBlank(line)) {
@ -390,7 +392,8 @@ public final class SpiLoader<S> {
defaultClass = clazz; defaultClass = clazz;
} }
RecordLog.info("[SpiLoader]Found SPI,Service={},Provider={},aliasname={},isSingleton={},isDefault={},order={}", RecordLog.info("[SpiLoader] Found SPI implementation for SPI {}, provider={}, aliasName={}"
+ ", isSingleton={}, isDefault={}, order={}",
service.getName(), line, aliasName service.getName(), line, aliasName
, spi == null ? true : spi.isSingleton() , spi == null ? true : spi.isSingleton()
, spi == null ? false : spi.isDefault() , spi == null ? false : spi.isDefault()