#289 fix parameter problem

vipshop · Jan 12, 2018 · afdf3f7 · afdf3f7
1 parent 1bc54cb
commit afdf3f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/...sole-api/src/main/java/com/vip/saturn/job/console/controller/gui/DashboardController.java b/...sole-api/src/main/java/com/vip/saturn/job/console/controller/gui/DashboardController.java
@@ -289,7 +289,7 @@ public SuccessResponseEntity cleanShardingCount(@PathVariable String namespace)
 	@PostMapping(value = "/namespaces/{namespace:.+}/jobs/{jobName}/jobAnalyse/clean")
 	public SuccessResponseEntity cleanJobAnalyse(@PathVariable String namespace, @PathVariable String jobName)
 			throws SaturnJobConsoleException {
-		dashboardService.cleanOneJobAnalyse(jobName, namespace);
+		dashboardService.cleanOneJobAnalyse(namespace, jobName);
 		return new SuccessResponseEntity();
 	}
 
@@ -304,7 +304,7 @@ public SuccessResponseEntity cleanJobsAnalyse(@PathVariable String namespace) th
 	@PostMapping(value = "/namespaces/{namespace:.+}/jobs/{jobName}/jobExecutorCount/clean")
 	public SuccessResponseEntity cleanJobExecutorCount(@PathVariable String namespace, @PathVariable String jobName)
 			throws SaturnJobConsoleException {
-		dashboardService.cleanOneJobExecutorCount(jobName, namespace);
+		dashboardService.cleanOneJobExecutorCount(namespace, jobName);
 		return new SuccessResponseEntity();
 	}
 

diff --git a/...in/java/com/vip/saturn/job/console/service/impl/refresh/StatisticsRefreshServiceImpl.java b/...in/java/com/vip/saturn/job/console/service/impl/refresh/StatisticsRefreshServiceImpl.java
@@ -284,8 +284,8 @@ public Boolean call() throws Exception {
 
 	private boolean analyzeStatistics(StatisticsModel statisticsModel, ZkCluster zkCluster,
 			RegistryCenterConfiguration config) {
+		String namespace = config.getNamespace();
 		try {
-			String namespace = config.getNamespace();
 			DomainStatistics domain = statisticsModel.getDomainStatisticsAnalyzer().initDomain(zkCluster, config);
 			CuratorRepository.CuratorFrameworkOp curatorFrameworkOp = registryCenterService
 					.getCuratorFrameworkOp(namespace);
@@ -309,13 +309,12 @@ private boolean analyzeStatistics(StatisticsModel statisticsModel, ZkCluster zkC
 							jobDegree, config);
 					statisticsModel.analyzeUnableFailoverJob(curatorFrameworkOp, job, jobDegree, config);
 				} catch (Exception e) {
-					log.info("statistics namespace:{} ,jobName:{} ,exception:{}", domain.getNns(), job,
-							e.getMessage());
+					log.info(String.format("analyzeStatistics namespace(%s) jobName(%s) error", namespace, job), e);
 				}
 			}
 			statisticsModel.analyzeProcessCount(domain, jobs, config);
 		} catch (Exception e) {
-			log.info("analyzeStatistics namespace:{} ,exception:{}", config.getNameAndNamespace(), e.getMessage());
+			log.info(String.format("analyzeStatistics namespace(%s) error", namespace), e);
 			return false;
 		}
 		return true;