chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed issue #2099 , rename poll to polling

Browse Source
This commit is contained in:
agapple
2019-08-27 16:25:42 +08:00
parent bf89974f7c
commit 7093179cc8
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/PollConfigController.java → canal-admin/canal-admin-server/src/main/java/com/alibaba/otter/canal/admin/controller/PollingConfigController.java
View File

@@ -30,7 +30,7 @@ import com.google.common.base.Joiner;
*/ */
@RestController @RestController
@RequestMapping("/api/{env}/config") @RequestMapping("/api/{env}/config")
public class PollConfigController { public class PollingConfigController {
private static final byte[] seeds = "canal is best!".getBytes(); private static final byte[] seeds = "canal is best!".getBytes();
@@ -49,7 +49,7 @@ public class PollConfigController {
/** /**
* 获取server全局配置 * 获取server全局配置
*/ */
@GetMapping(value = "/server_poll") @GetMapping(value = "/server_polling")
public BaseModel<CanalConfig> canalConfigPoll(@RequestHeader String user, @RequestHeader String passwd, public BaseModel<CanalConfig> canalConfigPoll(@RequestHeader String user, @RequestHeader String passwd,
@PathVariable String env, @RequestParam String md5) { @PathVariable String env, @RequestParam String md5) {
if (!auth(user, passwd)) { if (!auth(user, passwd)) {
@@ -76,7 +76,7 @@ public class PollConfigController {
/** /**
* 获取单个instance的配置 * 获取单个instance的配置
*/ */
@GetMapping(value = "/instance_poll/{destination}") @GetMapping(value = "/instance_polling/{destination}")
public BaseModel<CanalInstanceConfig> instanceConfigPoll(@RequestHeader String user, @RequestHeader String passwd, public BaseModel<CanalInstanceConfig> instanceConfigPoll(@RequestHeader String user, @RequestHeader String passwd,
@PathVariable String env, @PathVariable String env,
@PathVariable String destination, @RequestParam String md5) { @PathVariable String destination, @RequestParam String md5) {
@@ -103,7 +103,7 @@ public class PollConfigController {
/** /**
* 获取对应server(ip+port)所需要运行的instance列表 * 获取对应server(ip+port)所需要运行的instance列表
*/ */
@GetMapping(value = "/instances_poll") @GetMapping(value = "/instances_polling")
public BaseModel<CanalInstanceConfig> instancesPoll(@RequestHeader String user, @RequestHeader String passwd, public BaseModel<CanalInstanceConfig> instancesPoll(@RequestHeader String user, @RequestHeader String passwd,
@PathVariable String env, @RequestParam String ip, @PathVariable String env, @RequestParam String ip,
@RequestParam String port, @RequestParam String md5) { @RequestParam String port, @RequestParam String md5) {

6
instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/plain/PlainCanalConfigClient.java
View File

@@ -53,7 +53,7 @@ public class PlainCanalConfigClient extends AbstractCanalLifeCycle implements Ca
if (StringUtils.isEmpty(md5)) { if (StringUtils.isEmpty(md5)) {
md5 = ""; md5 = "";
} }
String url = configURL + "/api/v1/config/server_poll?md5=" + md5; String url = configURL + "/api/v1/config/server_polling?md5=" + md5;
return queryConfig(url); return queryConfig(url);
} }
@@ -64,7 +64,7 @@ public class PlainCanalConfigClient extends AbstractCanalLifeCycle implements Ca
if (StringUtils.isEmpty(md5)) { if (StringUtils.isEmpty(md5)) {
md5 = ""; md5 = "";
} }
String url = configURL + "/api/v1/config/instance_poll/" + destination + "?md5=" + md5; String url = configURL + "/api/v1/config/instance_polling/" + destination + "?md5=" + md5;
return queryConfig(url); return queryConfig(url);
} }
@@ -75,7 +75,7 @@ public class PlainCanalConfigClient extends AbstractCanalLifeCycle implements Ca
if (StringUtils.isEmpty(md5)) { if (StringUtils.isEmpty(md5)) {
md5 = ""; md5 = "";
} }
String url = configURL + "/api/v1/config/instances_poll?md5=" + md5 + "&ip=" + ip + "&port=" + port; String url = configURL + "/api/v1/config/instances_polling?md5=" + md5 + "&ip=" + ip + "&port=" + port;
ResponseModel<CanalConfig> config = doQuery(url); ResponseModel<CanalConfig> config = doQuery(url);
if (config.data != null) { if (config.data != null) {
return config.data.content; return config.data.content;