Skip to content

Commit 003d513

Browse files
author
walker
committed
fix server start log when tars admin servantAdapter config is less than server code
1 parent d9a8b3f commit 003d513

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

spring/tars-spring-boot-starter/src/main/java/com/qq/tars/server/apps/SpringBootAppContext.java

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,18 @@
2929
import com.qq.tars.server.core.ServantHomeSkeleton;
3030
import com.qq.tars.spring.annotation.TarsListener;
3131
import com.qq.tars.spring.annotation.TarsServant;
32+
import org.slf4j.Logger;
33+
import org.slf4j.LoggerFactory;
3234
import org.springframework.aop.framework.Advised;
3335
import org.springframework.context.ApplicationContext;
3436
import org.springframework.core.annotation.AnnotationUtils;
3537

3638
import java.util.Map;
3739

3840
public class SpringBootAppContext extends BaseAppContext {
41+
42+
private static final Logger logger = LoggerFactory.getLogger(SpringBootAppContext.class);
43+
3944
private ApplicationContext applicationContext;
4045

4146
public SpringBootAppContext(ApplicationContext applicationContext) {
@@ -71,11 +76,13 @@ private void loadAppServants() {
7176
for (Map.Entry<String, Object> entry : servantMap.entrySet()) {
7277
try {
7378
ServantHomeSkeleton skeleton = loadServant(entry.getValue());
79+
if(skeleton == null) {
80+
continue;
81+
}
7482
skeletonMap.put(skeleton.name(), skeleton);
7583
appServantStarted(skeleton);
7684
} catch (Throwable e) {
77-
System.err.println("init a Servant failed");
78-
e.printStackTrace();
85+
logger.error("init a Servant failed exMsg:{}", e.getMessage(), e);
7986
}
8087
}
8188

@@ -123,12 +130,16 @@ private ServantHomeSkeleton loadServant(Object bean) throws Throwable {
123130
}
124131

125132
ServantAdapterConfig servantAdapterConfig = serverCfg.getServantAdapterConfMap().get(homeName);
133+
if(servantAdapterConfig == null) {
134+
logger.warn("servant:{} 's servantAdapterConfig is null, not start this servant. If u need this servant, please config in tarsAdmin.",homeName);
135+
return null;
136+
}
126137

127-
ServantAdapter ServerAdapter = new ServantAdapter(servantAdapterConfig);
138+
ServantAdapter servantAdapter = new ServantAdapter(servantAdapterConfig);
128139
skeleton = new ServantHomeSkeleton(homeName, homeClassImpl, homeApiClazz, maxLoadLimit);
129140
skeleton.setAppContext(this);
130-
ServerAdapter.bind(skeleton);
131-
servantAdapterMap.put(homeName, ServerAdapter);
141+
servantAdapter.bind(skeleton);
142+
servantAdapterMap.put(homeName, servantAdapter);
132143
return skeleton;
133144
}
134145
}

0 commit comments

Comments
 (0)