natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DUBBO-20 解决设置delay属性导致服务一直处理禁用状态问题 

git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@148 1a56cb94-b969-4eaa-88fa-be21384802f2
This commit is contained in:
william.liangf 2011-10-31 11:16:54 +00:00
parent 0fe179e4eb
commit f44972d105
3 changed files with 30 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dubbo-config/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java
View File

@ -105,8 +105,11 @@ public class ReferenceConfig<T> extends AbstractConsumerConfig {
}
public synchronized void destroy() {
if (ref == null) {
throw new IllegalStateException("Uninitialized.");
}
if (destroyed){
throw new IllegalStateException("Already destroyed!");
return;
}
destroyed = true;
try {

62
dubbo-config/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java
View File

@ -91,31 +91,25 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
}
public synchronized void export() {
export(true);
}
@SuppressWarnings({ "unchecked", "rawtypes" })
protected synchronized void ready() {
for (URL url : urls) {
RpcStatus.getStatus(url).setReady(true);
}
List<URL> registryURLs = loadRegistries();
if (registryURLs != null && registryURLs.size() > 0) {
for (URL url : urls) {
String providerURL = url.addParameter("enabled", "true").toFullString();
for (URL registryURL : registryURLs) {
if (logger.isInfoEnabled()) {
logger.info("Register dubbo service " + interfaceClass.getName() + " url " + providerURL + " to registry " + registryURL);
if (delay != null && delay > 0) {
Thread thread = new Thread(new Runnable() {
public void run() {
try {
Thread.sleep(delay);
} catch (Throwable e) {
}
Invoker<?> invoker = proxyFactory.getInvoker(ref, (Class) interfaceClass, registryURL.addParameterAndEncoded(RpcConstants.EXPORT_KEY, providerURL));
Exporter<?> exporter = protocol.export(invoker);
exporters.add(exporter);
doExport();
}
}
});
thread.setDaemon(true);
thread.setName("DelayExportServiceThread");
thread.start();
} else {
doExport();
}
}
protected synchronized void export(boolean ready) {
protected synchronized void doExport() {
if (unexported) {
throw new IllegalStateException("Already unexported!");
}
@ -195,25 +189,10 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
path = interfaceName;
}
doExportUrls();
boolean r = (ready && (delay == null || delay <= 0));
for (URL url : urls) {
RpcStatus.getStatus(url).setReady(r);
}
doExport(r);
if (delay != null && delay > 0) {
Thread thread = new Thread(new Runnable() {
public void run() {
try {
Thread.sleep(delay);
} catch (Throwable e) {
}
ready();
}
});
thread.setDaemon(true);
thread.setName("DelayExportServiceThread");
thread.start();
RpcStatus.getStatus(url).setReady(true);
}
doExportService();
exported = true;
}
@ -276,8 +255,11 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
}
public synchronized void unexport() {
if (exported) {
throw new IllegalStateException("No exported!");
}
if (unexported) {
throw new IllegalStateException("Already unexported!");
return;
}
unexported = true;
if (exporters != null && exporters.size() > 0) {
@ -429,7 +411,7 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
}
@SuppressWarnings({ "unchecked", "rawtypes" })
private void doExport(boolean ready) {
private void doExportService() {
List<URL> registryURLs = loadRegistries();
for (URL url : urls) {
if (logger.isInfoEnabled()) {
@ -442,7 +424,7 @@ public class ServiceConfig<T> extends AbstractServiceConfig {
if (monitorUrl != null) {
url = url.addParameterAndEncoded(Constants.MONITOR_KEY, monitorUrl.toFullString());
}
String providerURL = url.addParameter("enabled", String.valueOf(ready)).toFullString();
String providerURL = url.toFullString();
if (logger.isInfoEnabled()) {
logger.info("Register dubbo service " + interfaceClass.getName() + " url " + providerURL + " to registry " + registryURL);
}

11
dubbo-config/src/main/java/com/alibaba/dubbo/config/spring/ServiceBean.java
View File

@ -78,7 +78,7 @@ public class ServiceBean<T> extends ServiceConfig<T> implements InitializingBean
if (logger.isInfoEnabled()) {
logger.info("The service ready on spring started. service: " + getInterface());
}
ready();
doExport();
}
}
}
@ -163,13 +163,10 @@ public class ServiceBean<T> extends ServiceConfig<T> implements InitializingBean
&& beanName.startsWith(getInterface())) {
setPath(beanName);
}
}
if (! isDelay()) {
doExport();
}
Integer delay = getDelay();
ProviderConfig provider = getProvider();
if (delay == null && provider != null) {
delay = provider.getDelay();
}
export(! isDelay());
}
}