switch to sl4j annotation

Author: gy2006

core/src/main/java/com/flowci/core/Application.java

@@ -17,7 +17,7 @@
 package com.flowci.core;
 
 import com.flowci.util.StringHelper;
-import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -31,7 +31,7 @@
 /**
  * @author yang
  */
-@Log4j2
+@Slf4j
 @SpringBootApplication
 public class Application {
 

core/src/main/java/com/flowci/core/agent/consumer/OnAgentCreated.java

@@ -1,15 +1,15 @@
 package com.flowci.core.agent.consumer;
 
+import com.flowci.core.agent.domain.Agent;
 import com.flowci.core.agent.event.AgentCreatedEvent;
 import com.flowci.core.common.domain.PushEvent;
 import com.flowci.core.common.manager.SocketPushManager;
-import com.flowci.core.agent.domain.Agent;
-import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Component;
 
-@Log4j2
+@Slf4j
 @Component
 public class OnAgentCreated implements ApplicationListener<AgentCreatedEvent> {
 

core/src/main/java/com/flowci/core/agent/consumer/OnAgentHostStatusChange.java

@@ -3,12 +3,12 @@
 import com.flowci.core.agent.event.AgentHostStatusEvent;
 import com.flowci.core.common.domain.PushEvent;
 import com.flowci.core.common.manager.SocketPushManager;
-import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Component;
 
-@Log4j2
+@Slf4j
 @Component
 public class OnAgentHostStatusChange implements ApplicationListener<AgentHostStatusEvent> {
 

core/src/main/java/com/flowci/core/agent/consumer/OnAgentStatusChange.java

@@ -16,19 +16,19 @@
 
 package com.flowci.core.agent.consumer;
 
+import com.flowci.core.agent.domain.Agent;
 import com.flowci.core.agent.event.AgentStatusEvent;
 import com.flowci.core.common.domain.PushEvent;
 import com.flowci.core.common.manager.SocketPushManager;
-import com.flowci.core.agent.domain.Agent;
-import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Component;
 
 /**
  * @author yang
  */
-@Log4j2
+@Slf4j
 @Component
 public class OnAgentStatusChange implements ApplicationListener<AgentStatusEvent> {
 

core/src/main/java/com/flowci/core/agent/controller/AgentController.java

@@ -22,7 +22,7 @@
 import com.flowci.core.agent.domain.DeleteAgent;
 import com.flowci.core.agent.service.AgentService;
 import com.flowci.core.auth.annotation.Action;
-import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -32,7 +32,7 @@
 /**
  * @author yang
  */
-@Log4j2
+@Slf4j
 @RestController
 @RequestMapping("/agents")
 public class AgentController {

core/src/main/java/com/flowci/core/agent/controller/AgentHostController.java

@@ -21,14 +21,14 @@
 import com.flowci.core.agent.domain.AgentHostOption;
 import com.flowci.core.agent.service.AgentHostService;
 import com.flowci.core.auth.annotation.Action;
-import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-@Log4j2
+@Slf4j
 @RestController
 @RequestMapping("/hosts")
 public class AgentHostController {

core/src/main/java/com/flowci/core/agent/manager/AgentEventManager.java

@@ -1,12 +1,13 @@
 package com.flowci.core.agent.manager;
 
+import com.fasterxml.jackson.core.JacksonException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.flowci.core.agent.domain.*;
 import com.flowci.core.agent.event.*;
 import com.flowci.core.common.domain.StatusCode;
 import com.flowci.core.common.domain.http.ResponseMessage;
 import com.flowci.core.common.manager.SpringEventManager;
-import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.socket.BinaryMessage;
@@ -23,7 +24,7 @@
 /**
  * Handle event from agent via websocket
  */
-@Log4j2
+@Slf4j
 @Component
 public class AgentEventManager extends BinaryWebSocketHandler {
 
@@ -128,8 +129,8 @@ private <T> void writeMessage(WebSocketSession session, ResponseMessage<T> msg)
         try {
             byte[] bytes = objectMapper.writeValueAsBytes(msg);
             writeMessage(session, bytes);
-        } catch (IOException e) {
-            log.warn(e);
+        } catch (JacksonException e) {
+            log.warn("Unable to convert agent response message", e);
         }
     }
 
@@ -138,7 +139,7 @@ private void writeMessage(WebSocketSession session, byte[] body) {
             try {
                 session.sendMessage(new BinaryMessage(body));
             } catch (IOException e) {
-                log.warn(e);
+                log.warn("Unable to send message", e);
             }
         }
     }
@@ -159,26 +160,22 @@ private void onConnected(WebSocketSession session, String token, byte[] body) {
             writeMessage(token, new ResponseMessage<>(StatusCode.OK, agent.getConfig()));
             log.debug("Agent {} is connected with status {}", token, init.getStatus());
         } catch (Exception e) {
-            log.warn(e);
+            log.warn("Agent connected error", e);
             writeMessage(session, new ResponseMessage<Void>(StatusCode.FATAL, e.getMessage(), null));
         }
     }
 
     private void onCmdOut(String token, byte[] body) {
-        try {
-            log.debug("Agent {} got cmd back: {}", token, new String(body));
-            eventManager.publish(new OnCmdOutEvent(this, body));
-        } catch (Exception e) {
-            log.warn(e);
-        }
+        log.debug("Agent {} got cmd back: {}", token, new String(body));
+        eventManager.publish(new OnCmdOutEvent(this, body));
     }
 
     private void onShellLog(byte[] body) {
         try {
             ShellLog item = objectMapper.readValue(body, ShellLog.class);
             eventManager.publish(new OnShellLogEvent(this, item.getJobId(), item.getStepId(), item.getLog()));
         } catch (IOException e) {
-            log.warn(e);
+            log.warn("Unable to convert to ShellLog", e);
         }
     }
 
@@ -187,7 +184,7 @@ private void onTtyLog(byte[] body) {
             TtyCmd.Log item = objectMapper.readValue(body, TtyCmd.Log.class);
             eventManager.publish(new OnTTYLogEvent(this, item.getId(), item.getLog()));
         } catch (IOException e) {
-            log.warn(e);
+            log.warn("Unable to convert to TtyCmd.Log", e);
         }
     }
 
@@ -197,7 +194,7 @@ private void onProfile(String token, byte[] body) {
             profile.setId(token);
             eventManager.publish(new OnAgentProfileEvent(this, profile));
         } catch (IOException e) {
-            log.warn(e);
+            log.warn("Unable to convert to AgentProfile", e);
         }
     }
 

core/src/main/java/com/flowci/core/agent/service/AgentHostServiceImpl.java

@@ -46,6 +46,7 @@
 import com.google.common.base.Preconditions;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.core.env.Environment;
@@ -63,7 +64,7 @@
 import static com.flowci.core.secret.domain.Secret.Category.KUBE_CONFIG;
 import static com.flowci.core.secret.domain.Secret.Category.SSH_RSA;
 
-@Log4j2
+@Slf4j
 @Service
 public class AgentHostServiceImpl implements AgentHostService {
 
@@ -665,7 +666,7 @@ public int hashCode() {
         }
     }
 
-    @Log4j2
+    @Slf4j
     private static class PoolManagerRemover implements RemovalListener<AgentHost, DockerManager> {
 
         @Override

core/src/main/java/com/flowci/core/agent/service/AgentServiceImpl.java

@@ -40,7 +40,7 @@
 import com.flowci.zookeeper.InterLock;
 import com.flowci.zookeeper.ZookeeperClient;
 import com.google.common.collect.Sets;
-import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.dao.DuplicateKeyException;
@@ -60,7 +60,7 @@
  *
  * @author yang
  */
-@Log4j2
+@Slf4j
 @Service
 public class AgentServiceImpl implements AgentService {
 
@@ -377,7 +377,7 @@ public void dispatch(CmdIn cmd, Agent agent) {
             agentEventManager.writeMessage(agent.getToken(), body);
             eventManager.publish(new CmdSentEvent(this, agent, cmd));
         } catch (IOException e) {
-            log.warn(e);
+            log.warn("Unable to write CmdIn", e);
         }
     }
 
@@ -450,7 +450,7 @@ private void unlock(InterLock lock) {
             zk.release(lock);
             log.debug("Unlock: {}", FetchAgentLockKey);
         } catch (Exception warn) {
-            log.warn(warn);
+            log.warn("Unable to unlock agent", warn);
         }
     }
 }

core/src/main/java/com/flowci/core/api/OpenRestController.java

@@ -29,7 +29,7 @@
 import com.flowci.core.secret.domain.Secret;
 import com.flowci.core.user.domain.User;
 import com.flowci.exception.ArgumentException;
-import lombok.extern.log4j.Log4j2;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.core.io.Resource;
@@ -48,7 +48,7 @@
 /**
  * Provides API which calling from agent plugin
  */
-@Log4j2
+@Slf4j
 @RestController
 @RequestMapping("/api")
 public class OpenRestController {