Forráskód Böngészése

style: 修改日志格式

370774330@qq.com 5 éve
szülő
commit
e712d63ac9

+ 3 - 3
core/src/main/java/seecoder/devcloud/core/pipeline/handler/K8sDeploymentHandler.java

@@ -104,11 +104,11 @@ public class K8sDeploymentHandler extends AbstractHandler {
         //4. 创建Deployment。
         //4. 创建Deployment。
         try {
         try {
             deploymentApi.create(deployment);
             deploymentApi.create(deployment);
-            log.info("deployment创建成功");
+            log.info("deployment创建成功: [namespace: " + context.getNamespace() +", deployName: " + context.getTemplateName() + "]");
         } catch (K8sApiException e){
         } catch (K8sApiException e){
             if (e.getCode() == K8sApiException.ALREADY_EXIST){
             if (e.getCode() == K8sApiException.ALREADY_EXIST){
                 deploymentApi.update(deployment);
                 deploymentApi.update(deployment);
-                log.info("deployment更新成功");
+                log.info("deployment更新成功: [namespace: " + context.getNamespace() +", deployName: " + context.getTemplateName() + "]");
             } else {
             } else {
                 context.appendErrorResult(PipelineException.DEPLOYMENT_CREATE_ERROR,e);
                 context.appendErrorResult(PipelineException.DEPLOYMENT_CREATE_ERROR,e);
                 throw new PipelineException(HttpStatus.SC_SERVICE_UNAVAILABLE,PipelineException.DEPLOYMENT_CREATE_ERROR,e);
                 throw new PipelineException(HttpStatus.SC_SERVICE_UNAVAILABLE,PipelineException.DEPLOYMENT_CREATE_ERROR,e);
@@ -117,7 +117,7 @@ public class K8sDeploymentHandler extends AbstractHandler {
 
 
         //5. 存入暴露的端口
         //5. 存入暴露的端口
         context.getConfigs().put("port",String.valueOf(port));
         context.getConfigs().put("port",String.valueOf(port));
-        context.appendSuccessResult("K8s Deployment部署成功");
+        context.appendSuccessResult("K8s Deployment部署成功: [namespace: " + context.getNamespace() +", deployName: " + context.getTemplateName() + "]");
     }
     }
 
 
 }
 }

+ 3 - 3
core/src/main/java/seecoder/devcloud/core/pipeline/handler/K8sNamespaceHandler.java

@@ -35,16 +35,16 @@ public class K8sNamespaceHandler extends AbstractHandler {
         //todo namespace在底下资源未删除时,不能轻易删除重建,只能直接通过异常查是否已创建,丑陋,待修改
         //todo namespace在底下资源未删除时,不能轻易删除重建,只能直接通过异常查是否已创建,丑陋,待修改
         try {
         try {
             namespace = namespaceApi.create(namespace);
             namespace = namespaceApi.create(namespace);
-            log.info("Namespace创建成功, {}", namespace);
+            log.info("Namespace创建成功: [namespace: " + context.getNamespace() +", deployName: " + context.getTemplateName() + "]");
         } catch (K8sApiException e){
         } catch (K8sApiException e){
             if (e.getCode() == K8sApiException.ALREADY_EXIST){
             if (e.getCode() == K8sApiException.ALREADY_EXIST){
-                log.info("Namespace已经存在, 无需新建");
+                log.info("Namespace已经存在, 无需新建: [namespace: " + context.getNamespace() +", deployName: " + context.getTemplateName() + "]");
             } else{
             } else{
                 context.appendErrorResult(PipelineException.NAMESPACE_CREATE_ERROR,e);
                 context.appendErrorResult(PipelineException.NAMESPACE_CREATE_ERROR,e);
                 throw new PipelineException(HttpStatus.SC_SERVICE_UNAVAILABLE,PipelineException.NAMESPACE_CREATE_ERROR,e);
                 throw new PipelineException(HttpStatus.SC_SERVICE_UNAVAILABLE,PipelineException.NAMESPACE_CREATE_ERROR,e);
             }
             }
         }
         }
 
 
-        context.appendSuccessResult("K8s Namespace创建成功");
+        context.appendSuccessResult("K8s Namespace创建成功: [namespace: " + context.getNamespace() +", deployName: " + context.getTemplateName() + "]");
     }
     }
 }
 }

+ 3 - 3
core/src/main/java/seecoder/devcloud/core/pipeline/handler/K8sServiceHandler.java

@@ -51,11 +51,11 @@ public class K8sServiceHandler extends AbstractHandler {
         //2. 创建
         //2. 创建
         try {
         try {
             serviceApi.create(service);
             serviceApi.create(service);
-            log.info("service创建成功");
+            log.info("service创建成功: [namespace: " + context.getNamespace() +", deployName: " + context.getTemplateName() + "]");
         } catch (K8sApiException e){
         } catch (K8sApiException e){
             if (e.getCode() == K8sApiException.ALREADY_EXIST){
             if (e.getCode() == K8sApiException.ALREADY_EXIST){
                 serviceApi.update(service);
                 serviceApi.update(service);
-                log.info("service更新成功");
+                log.info("service更新成功: [namespace: " + context.getNamespace() +", deployName: " + context.getTemplateName() + "]");
             } else {
             } else {
                 context.appendErrorResult(PipelineException.SERVICE_CREATE_ERROR,e);
                 context.appendErrorResult(PipelineException.SERVICE_CREATE_ERROR,e);
                 throw new PipelineException(HttpStatus.SC_SERVICE_UNAVAILABLE,PipelineException.SERVICE_CREATE_ERROR,e);
                 throw new PipelineException(HttpStatus.SC_SERVICE_UNAVAILABLE,PipelineException.SERVICE_CREATE_ERROR,e);
@@ -64,6 +64,6 @@ public class K8sServiceHandler extends AbstractHandler {
 
 
         //3. 存放暴露的端口
         //3. 存放暴露的端口
         context.getConfigs().put("servicePort", String.valueOf(servicePort));
         context.getConfigs().put("servicePort", String.valueOf(servicePort));
-        context.appendSuccessResult("K8s Service创建成功");
+        context.appendSuccessResult("K8s Service创建成功: [namespace: " + context.getNamespace() +", deployName: " + context.getTemplateName() + "]");
     }
     }
 }
 }