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

fix 数据源创建失败缺少cause(#653) #657

Merged
merged 1 commit into from
Jul 23, 2024
Merged

fix 数据源创建失败缺少cause(#653) #657

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ...r/src/main/java/com/baomidou/dynamic/datasource/creator/basic/BasicDataSourceCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public DataSource createDataSource(DataSourceProperty dataSourceProperty) {
return (DataSource) buildMethod.invoke(o6);
} catch (Exception e) {
throw new ErrorCreateDataSourceException(
"dynamic-datasource create basic database named " + dataSourceProperty.getPoolName() + " error");
"dynamic-datasource create datasource named [" + dataSourceProperty.getPoolName() + "] error", e);
}
}

Expand Down
8 changes: 7 additions & 1 deletion ...r/src/main/java/com/baomidou/dynamic/datasource/creator/beecp/BeeCpDataSourceCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.baomidou.dynamic.datasource.creator.DataSourceCreator;
import com.baomidou.dynamic.datasource.creator.DataSourceProperty;
import com.baomidou.dynamic.datasource.enums.DdConstants;
import com.baomidou.dynamic.datasource.exception.ErrorCreateDataSourceException;
import com.baomidou.dynamic.datasource.toolkit.ConfigMergeCreator;
import com.baomidou.dynamic.datasource.toolkit.DsStrUtils;
import lombok.AllArgsConstructor;
Expand Down Expand Up @@ -66,7 +67,12 @@ public DataSource createDataSource(DataSourceProperty dataSourceProperty) {
config.setDriverClassName(driverClassName);
}
if (Boolean.FALSE.equals(dataSourceProperty.getLazy())) {
return new BeeDataSource(config);
try {
return new BeeDataSource(config);
} catch (Exception e) {
throw new ErrorCreateDataSourceException(
"dynamic-datasource create datasource named [" + dataSourceProperty.getPoolName() + "] error", e);
}
}
BeeDataSource beeDataSource = new BeeDataSource();
try {
Expand Down
9 changes: 8 additions & 1 deletion ...or/src/main/java/com/baomidou/dynamic/datasource/creator/dbcp/Dbcp2DataSourceCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.baomidou.dynamic.datasource.creator.DataSourceCreator;
import com.baomidou.dynamic.datasource.creator.DataSourceProperty;
import com.baomidou.dynamic.datasource.enums.DdConstants;
import com.baomidou.dynamic.datasource.exception.ErrorCreateDataSourceException;
import com.baomidou.dynamic.datasource.toolkit.ConfigMergeCreator;
import com.baomidou.dynamic.datasource.toolkit.DsStrUtils;
import lombok.AllArgsConstructor;
Expand Down Expand Up @@ -53,7 +54,13 @@ public DataSource createDataSource(DataSourceProperty dataSourceProperty) {
dataSource.setDriverClassName(driverClassName);
}
if (Boolean.FALSE.equals(dataSourceProperty.getLazy())) {
dataSource.start();
try {
dataSource.start();
}catch (Exception e) {

throw new ErrorCreateDataSourceException(
"dynamic-datasource create Dbcp2 database named " + dataSourceProperty.getPoolName() + " error", e);
}
}
return dataSource;
}
Expand Down
7 changes: 4 additions & 3 deletions ...r/src/main/java/com/baomidou/dynamic/datasource/creator/druid/DruidDataSourceCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public DataSource createDataSource(DataSourceProperty dataSourceProperty) {
try {
configMethod.invoke(dataSource, properties);
} catch (Exception ignore) {

// Druid only prints logs when copying property errors
}
//连接参数单独设置
dataSource.setConnectProperties(config.getConnectionProperties());
Expand All @@ -135,8 +135,9 @@ public DataSource createDataSource(DataSourceProperty dataSourceProperty) {
if (Boolean.FALSE.equals(dataSourceProperty.getLazy())) {
try {
dataSource.init();
} catch (SQLException e) {
throw new ErrorCreateDataSourceException("druid create error", e);
} catch (Exception e) {
throw new ErrorCreateDataSourceException(
"dynamic-datasource create datasource named [" + dataSourceProperty.getPoolName() + "] error", e);
}
}
return dataSource;
Expand Down
10 changes: 8 additions & 2 deletions ...c/main/java/com/baomidou/dynamic/datasource/creator/hikaricp/HikariDataSourceCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.baomidou.dynamic.datasource.creator.DataSourceCreator;
import com.baomidou.dynamic.datasource.creator.DataSourceProperty;
import com.baomidou.dynamic.datasource.enums.DdConstants;
import com.baomidou.dynamic.datasource.exception.ErrorCreateDataSourceException;
import com.baomidou.dynamic.datasource.toolkit.ConfigMergeCreator;
import com.baomidou.dynamic.datasource.toolkit.DsStrUtils;
import com.zaxxer.hikari.HikariConfig;
Expand Down Expand Up @@ -82,14 +83,19 @@ public DataSource createDataSource(DataSourceProperty dataSourceProperty) {
config.setDriverClassName(driverClassName);
}
if (Boolean.FALSE.equals(dataSourceProperty.getLazy())) {
return new HikariDataSource(config);
try {
return new HikariDataSource(config);
}catch (Exception e){
throw new ErrorCreateDataSourceException(
"dynamic-datasource create datasource named [" + dataSourceProperty.getPoolName() + "] error", e);
}
}
config.validate();
HikariDataSource dataSource = new HikariDataSource();
try {
configCopyMethod.invoke(config, dataSource);
} catch (IllegalAccessException | InvocationTargetException e) {
throw new RuntimeException("HikariConfig failed to copy to HikariDataSource", e);
throw new ErrorCreateDataSourceException("HikariConfig failed to copy to HikariDataSource", e);
}
return dataSource;
}
Expand Down
Loading