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

[ISSUE 2989] where config publish could not trigger horizontal notification i… #2990

Merged
merged 1 commit into from
Jun 8, 2020
Merged

[ISSUE 2989] where config publish could not trigger horizontal notification i… #2990

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
23 changes: 22 additions & 1 deletion ...com/alibaba/nacos/config/server/service/repository/EmbeddedStoragePersistServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,20 @@
import com.alibaba.nacos.config.server.model.SameConfigPolicy;
import com.alibaba.nacos.config.server.model.SubInfo;
import com.alibaba.nacos.config.server.model.TenantInfo;
import com.alibaba.nacos.config.server.model.event.ConfigDataChangeEvent;
import com.alibaba.nacos.config.server.service.datasource.DataSourceService;
import com.alibaba.nacos.config.server.service.datasource.DynamicDataSource;
import com.alibaba.nacos.config.server.service.sql.EmbeddedStorageContextUtils;
import com.alibaba.nacos.config.server.utils.LogUtil;
import com.alibaba.nacos.config.server.utils.ParamUtils;
import com.alibaba.nacos.config.server.utils.event.EventDispatcher;
import com.alibaba.nacos.core.distributed.id.IdGeneratorManager;
import com.alibaba.nacos.core.utils.ApplicationUtils;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.context.annotation.Conditional;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
import org.springframework.transaction.support.TransactionTemplate;
Expand Down Expand Up @@ -384,6 +386,12 @@ public void insertOrUpdateBeta(final ConfigInfo configInfo, final String betaIps
else {
updateConfigInfo4Beta(configInfo, betaIps, srcIp, null, time, notify);
}
if (ApplicationUtils.getStandaloneMode()) {
EventDispatcher.fireEvent(
new ConfigDataChangeEvent(true, configInfo.getDataId(),
configInfo.getGroup(), configInfo.getTenant(),
time.getTime()));
}
}

public void insertOrUpdateTag(final ConfigInfo configInfo, final String tag,
Expand All @@ -396,6 +404,12 @@ public void insertOrUpdateTag(final ConfigInfo configInfo, final String tag,
else {
updateConfigInfo4Tag(configInfo, tag, srcIp, null, time, notify);
}
if (ApplicationUtils.getStandaloneMode()) {
EventDispatcher.fireEvent(
new ConfigDataChangeEvent(false, configInfo.getDataId(),
configInfo.getGroup(), configInfo.getTenant(), tag,
time.getTime()));
}
}

public void updateMd5(String dataId, String group, String tenant, String md5,
Expand Down Expand Up @@ -434,6 +448,12 @@ public void insertOrUpdate(String srcIp, String srcUser, ConfigInfo configInfo,
else {
updateConfigInfo(configInfo, srcIp, srcUser, time, configAdvanceInfo, notify);
}
if (ApplicationUtils.getStandaloneMode()) {
EventDispatcher.fireEvent(
new ConfigDataChangeEvent(false, configInfo.getDataId(),
configInfo.getGroup(), configInfo.getTenant(),
time.getTime()));
}
}

public void insertOrUpdateSub(SubInfo subInfo) {
Expand Down Expand Up @@ -2610,3 +2630,4 @@ public int tenantInfoCountByTenantId(String tenantId) {
}

}