lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化异常抛出

Browse Source
This commit is contained in:
redkale
2024-05-24 12:00:27 +08:00
parent 4f008796d7
commit b4ded6f746
4 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/redkale/boot/Application.java
View File

@@ -387,7 +387,7 @@ public final class Application {
return application; return application;
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.SEVERE, "Resource inject error", e); logger.log(Level.SEVERE, "Resource inject error", e);
return null; throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e);
} }
} }
@@ -412,7 +412,7 @@ public final class Application {
return rs; return rs;
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.SEVERE, "Resource inject error", e); logger.log(Level.SEVERE, "Resource inject error", e);
return null; throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e);
} }
} }
@@ -445,7 +445,7 @@ public final class Application {
return server; return server;
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.SEVERE, "Resource inject error", e); logger.log(Level.SEVERE, "Resource inject error", e);
return null; throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e);
} }
} }
@@ -478,7 +478,7 @@ public final class Application {
return server; return server;
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.SEVERE, "Resource inject error", e); logger.log(Level.SEVERE, "Resource inject error", e);
return null; throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e);
} }
} }
@@ -511,7 +511,7 @@ public final class Application {
return server; return server;
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.SEVERE, "Resource inject error", e); logger.log(Level.SEVERE, "Resource inject error", e);
return null; throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e);
} }
} }
@@ -567,7 +567,7 @@ public final class Application {
return httpClient; return httpClient;
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.SEVERE, WebClient.class.getSimpleName() + " inject error", e); logger.log(Level.SEVERE, WebClient.class.getSimpleName() + " inject error", e);
return null; throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e);
} }
} }
@@ -608,7 +608,7 @@ public final class Application {
return rpcClient; return rpcClient;
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.SEVERE, HttpRpcClient.class.getSimpleName() + " inject error", e); logger.log(Level.SEVERE, HttpRpcClient.class.getSimpleName() + " inject error", e);
return null; throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e);
} }
} }

2
src/main/java/org/redkale/boot/NodeHttpServer.java
View File

@@ -185,7 +185,7 @@ public class NodeHttpServer extends NodeServer {
} }
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.SEVERE, "WebSocketNode inject error", e); logger.log(Level.SEVERE, "WebSocketNode inject error", e);
return null; throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e);
} }
} }

6
src/main/java/org/redkale/boot/NodeServer.java
View File

@@ -297,7 +297,7 @@ public abstract class NodeServer {
return nodeService; return nodeService;
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.SEVERE, "WebSocketNode inject error", e); logger.log(Level.SEVERE, "WebSocketNode inject error", e);
return null; throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e);
} }
} }
@@ -451,10 +451,8 @@ public abstract class NodeServer {
} }
serviceCount.incrementAndGet(); serviceCount.incrementAndGet();
return service; return service;
} catch (RuntimeException ex) {
throw ex;
} catch (Exception e) { } catch (Exception e) {
throw new RedkaleException(e); throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e);
} }
} }

30
src/main/java/org/redkale/source/spi/SourceModuleEngine.java
View File

@@ -156,7 +156,8 @@ public class SourceModuleEngine extends ModuleEngine implements SourceManager {
if (event.name().startsWith("redkale.datasource.") || event.name().startsWith("redkale.datasource[") if (event.name().startsWith("redkale.datasource.") || event.name().startsWith("redkale.datasource[")
|| event.name().startsWith("redkale.cachesource.") || event.name().startsWith("redkale.cachesource[")) { || event.name().startsWith("redkale.cachesource.") || event.name().startsWith("redkale.cachesource[")) {
if (event.name().endsWith(".name")) { if (event.name().endsWith(".name")) {
logger.log(Level.WARNING, "skip illegal key " + event.name() + " in source config " + (namespace == null ? "" : namespace) + ", key cannot endsWith '.name'"); logger.log(Level.WARNING, "skip illegal key " + event.name()
+ " in source config " + (namespace == null ? "" : namespace) + ", key cannot endsWith '.name'");
} else { } else {
if (!Objects.equals(event.newValue(), this.sourceProperties.getProperty(event.name()))) { if (!Objects.equals(event.newValue(), this.sourceProperties.getProperty(event.name()))) {
if (event.newValue() == null) { if (event.newValue() == null) {
@@ -373,7 +374,8 @@ public class SourceModuleEngine extends ModuleEngine implements SourceManager {
if (!application.isCompileMode() && source instanceof Service) { if (!application.isCompileMode() && source instanceof Service) {
((Service) source).init(sourceConf); ((Service) source).init(sourceConf);
} }
logger.info("Load CacheSource resourceName = '" + sourceName + "', source = " + source + " in " + (System.currentTimeMillis() - st) + " ms"); logger.info("Load CacheSource resourceName = '" + sourceName
+ "', source = " + source + " in " + (System.currentTimeMillis() - st) + " ms");
return source; return source;
} }
if (!sourceConf.getValue(AbstractCacheSource.CACHE_SOURCE_RESOURCE, "").isEmpty()) { if (!sourceConf.getValue(AbstractCacheSource.CACHE_SOURCE_RESOURCE, "").isEmpty()) {
@@ -389,7 +391,8 @@ public class SourceModuleEngine extends ModuleEngine implements SourceManager {
cacheSources.add(source); cacheSources.add(source);
resourceFactory.register(sourceName, CacheSource.class, source); resourceFactory.register(sourceName, CacheSource.class, source);
logger.info("Load CacheSource resourceName = '" + sourceName + "', source = " + source + " in " + (System.currentTimeMillis() - st) + " ms"); logger.info("Load CacheSource resourceName = '" + sourceName
+ "', source = " + source + " in " + (System.currentTimeMillis() - st) + " ms");
return source; return source;
} catch (RuntimeException ex) { } catch (RuntimeException ex) {
throw ex; throw ex;
@@ -435,7 +438,8 @@ public class SourceModuleEngine extends ModuleEngine implements SourceManager {
} }
dataSources.add(source); dataSources.add(source);
resourceFactory.register(sourceName, DataSource.class, source); resourceFactory.register(sourceName, DataSource.class, source);
logger.info("Load DataSource resourceName = '" + sourceName + "', source = " + source + " in " + (System.currentTimeMillis() - st) + " ms"); logger.info("Load DataSource resourceName = '" + sourceName
+ "', source = " + source + " in " + (System.currentTimeMillis() - st) + " ms");
return source; return source;
} }
if (!sourceConf.getValue(DataSources.DATA_SOURCE_RESOURCE, "").isEmpty()) { if (!sourceConf.getValue(DataSources.DATA_SOURCE_RESOURCE, "").isEmpty()) {
@@ -475,7 +479,8 @@ public class SourceModuleEngine extends ModuleEngine implements SourceManager {
resourceFactory.register(sourceName, DataJdbcSource.class, source); resourceFactory.register(sourceName, DataJdbcSource.class, source);
} }
} }
logger.info("Load DataSource resourceName = '" + sourceName + "', source = " + source + " in " + (System.currentTimeMillis() - st) + " ms"); logger.info("Load DataSource resourceName = '" + sourceName
+ "', source = " + source + " in " + (System.currentTimeMillis() - st) + " ms");
return source; return source;
} catch (RuntimeException ex) { } catch (RuntimeException ex) {
throw ex; throw ex;
@@ -519,7 +524,7 @@ public class SourceModuleEngine extends ModuleEngine implements SourceManager {
private class DataSqlMapperLoader implements ResourceTypeLoader { private class DataSqlMapperLoader implements ResourceTypeLoader {
@Override @Override
public Object load(ResourceFactory rf, String srcResourceName, final Object srcObj, final String resourceName, Field field, final Object attachment) { public Object load(ResourceFactory rf, String srcResourceName, Object srcObj, String resourceName, Field field, Object attachment) {
try { try {
if ((srcObj instanceof Service) && Sncp.isRemote((Service) srcObj)) { if ((srcObj instanceof Service) && Sncp.isRemote((Service) srcObj)) {
return null; //远程模式不得注入 return null; //远程模式不得注入
@@ -536,7 +541,7 @@ public class SourceModuleEngine extends ModuleEngine implements SourceManager {
return mapper; return mapper;
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.SEVERE, DataSqlMapper.class.getSimpleName() + " inject to " + srcObj + " error", e); logger.log(Level.SEVERE, DataSqlMapper.class.getSimpleName() + " inject to " + srcObj + " error", e);
return null; throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e);
} }
} }
@@ -549,7 +554,7 @@ public class SourceModuleEngine extends ModuleEngine implements SourceManager {
private class DataSourceLoader implements ResourceTypeLoader { private class DataSourceLoader implements ResourceTypeLoader {
@Override @Override
public Object load(ResourceFactory rf, String srcResourceName, final Object srcObj, final String resourceName, Field field, final Object attachment) { public Object load(ResourceFactory rf, String srcResourceName, Object srcObj, String resourceName, Field field, Object attachment) {
try { try {
if ((srcObj instanceof Service) && Sncp.isRemote((Service) srcObj)) { if ((srcObj instanceof Service) && Sncp.isRemote((Service) srcObj)) {
return null; //远程模式不得注入 return null; //远程模式不得注入
@@ -559,7 +564,7 @@ public class SourceModuleEngine extends ModuleEngine implements SourceManager {
return source; return source;
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.SEVERE, "DataSource inject to " + srcObj + " error", e); logger.log(Level.SEVERE, "DataSource inject to " + srcObj + " error", e);
return null; throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e);
} }
} }
@@ -572,7 +577,7 @@ public class SourceModuleEngine extends ModuleEngine implements SourceManager {
private class CacheSourceLoader implements ResourceTypeLoader { private class CacheSourceLoader implements ResourceTypeLoader {
@Override @Override
public Object load(ResourceFactory rf, String srcResourceName, final Object srcObj, final String resourceName, Field field, final Object attachment) { public Object load(ResourceFactory rf, String srcResourceName, Object srcObj, String resourceName, Field field, Object attachment) {
try { try {
if ((srcObj instanceof Service) && Sncp.isRemote((Service) srcObj)) { if ((srcObj instanceof Service) && Sncp.isRemote((Service) srcObj)) {
return null; //远程模式不得注入 return null; //远程模式不得注入
@@ -587,12 +592,13 @@ public class SourceModuleEngine extends ModuleEngine implements SourceManager {
if (res != null && res.required() && source == null) { if (res != null && res.required() && source == null) {
throw new RedkaleException("CacheSource (resourceName = '" + resourceName + "') not found"); throw new RedkaleException("CacheSource (resourceName = '" + resourceName + "') not found");
} else { } else {
logger.info("Load CacheSource (type = " + (source == null ? null : source.getClass().getSimpleName()) + ", resourceName = '" + resourceName + "')"); logger.info("Load CacheSource (type = " + (source == null ? null : source.getClass().getSimpleName())
+ ", resourceName = '" + resourceName + "')");
} }
return source; return source;
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.SEVERE, "DataSource inject error", e); logger.log(Level.SEVERE, "DataSource inject error", e);
return null; throw e instanceof RuntimeException ? (RuntimeException) e : new RedkaleException(e);
} }
} }