Commit 64a01a4e by Nepxion

修复小Bug

parent 870fb9de
...@@ -178,7 +178,7 @@ public class ConsoleEndpoint implements MvcEndpoint { ...@@ -178,7 +178,7 @@ public class ConsoleEndpoint implements MvcEndpoint {
ConsoleErrorHandler errorHandler = (ConsoleErrorHandler) consoleRestTemplate.getErrorHandler(); ConsoleErrorHandler errorHandler = (ConsoleErrorHandler) consoleRestTemplate.getErrorHandler();
result = errorHandler.getCause(); result = errorHandler.getCause();
} }
stringBuilder.append("Config updated, serviceId=").append(serviceId).append(", url=").append(url).append(", result=").append(result).append("\n"); stringBuilder.append("Result : serviceId=").append(serviceId).append(", url=").append(url).append(", result=").append(result).append("\n");
} }
String result = stringBuilder.toString(); String result = stringBuilder.toString();
...@@ -186,7 +186,7 @@ public class ConsoleEndpoint implements MvcEndpoint { ...@@ -186,7 +186,7 @@ public class ConsoleEndpoint implements MvcEndpoint {
result = result.substring(0, result.lastIndexOf("\n")); result = result.substring(0, result.lastIndexOf("\n"));
} }
LOG.info("Config updated result:\n{}", result); LOG.info("Config updated results :\n{}", result);
return ResponseEntity.ok().body(result); return ResponseEntity.ok().body(result);
} }
...@@ -211,7 +211,7 @@ public class ConsoleEndpoint implements MvcEndpoint { ...@@ -211,7 +211,7 @@ public class ConsoleEndpoint implements MvcEndpoint {
ConsoleErrorHandler errorHandler = (ConsoleErrorHandler) consoleRestTemplate.getErrorHandler(); ConsoleErrorHandler errorHandler = (ConsoleErrorHandler) consoleRestTemplate.getErrorHandler();
result = errorHandler.getCause(); result = errorHandler.getCause();
} }
stringBuilder.append("Version updated, serviceId=").append(serviceId).append(", url=").append(url).append(", result=").append(result).append("\n"); stringBuilder.append("Result : serviceId=").append(serviceId).append(", url=").append(url).append(", result=").append(result).append("\n");
} }
String result = stringBuilder.toString(); String result = stringBuilder.toString();
...@@ -219,7 +219,7 @@ public class ConsoleEndpoint implements MvcEndpoint { ...@@ -219,7 +219,7 @@ public class ConsoleEndpoint implements MvcEndpoint {
result = result.substring(0, result.lastIndexOf("\n")); result = result.substring(0, result.lastIndexOf("\n"));
} }
LOG.info("Version updated result:\n{}", result); LOG.info("Version updated results :\n{}", result);
return ResponseEntity.ok().body(result); return ResponseEntity.ok().body(result);
} }
...@@ -244,7 +244,7 @@ public class ConsoleEndpoint implements MvcEndpoint { ...@@ -244,7 +244,7 @@ public class ConsoleEndpoint implements MvcEndpoint {
ConsoleErrorHandler errorHandler = (ConsoleErrorHandler) consoleRestTemplate.getErrorHandler(); ConsoleErrorHandler errorHandler = (ConsoleErrorHandler) consoleRestTemplate.getErrorHandler();
result = errorHandler.getCause(); result = errorHandler.getCause();
} }
stringBuilder.append("Version cleared, serviceId=").append(serviceId).append(", url=").append(url).append(", result=").append(result).append("\n"); stringBuilder.append("Result : serviceId=").append(serviceId).append(", url=").append(url).append(", result=").append(result).append("\n");
} }
String result = stringBuilder.toString(); String result = stringBuilder.toString();
...@@ -252,7 +252,7 @@ public class ConsoleEndpoint implements MvcEndpoint { ...@@ -252,7 +252,7 @@ public class ConsoleEndpoint implements MvcEndpoint {
result = result.substring(0, result.lastIndexOf("\n")); result = result.substring(0, result.lastIndexOf("\n"));
} }
LOG.info("Version cleared result:\n{}", result); LOG.info("Version cleared results :\n{}", result);
return ResponseEntity.ok().body(result); return ResponseEntity.ok().body(result);
} }
......
...@@ -107,6 +107,8 @@ public class PluginSubscriber { ...@@ -107,6 +107,8 @@ public class PluginSubscriber {
refreshLoadBalancer(); refreshLoadBalancer();
LOG.info("********** Version has been updated, new version is {} **********", dynamicVersion); LOG.info("********** Version has been updated, new version is {} **********", dynamicVersion);
} else {
throw new PluginException("Version updating will be ignored, because input localVersion=" + localVersion + ", current localVersion=" + pluginAdapter.getLocalVersion());
} }
} }
} }
...@@ -141,6 +143,8 @@ public class PluginSubscriber { ...@@ -141,6 +143,8 @@ public class PluginSubscriber {
refreshLoadBalancer(); refreshLoadBalancer();
LOG.info("********** Version has been cleared **********"); LOG.info("********** Version has been cleared **********");
} else {
throw new PluginException("Version clearing will be ignored, because input localVersion=" + localVersion + ", current localVersion=" + pluginAdapter.getLocalVersion());
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment