Merge pull request #313 from FlowCI/feature/lombok

Feature/lombok

Author: yang.guo

platform-agent/pom.xml

@@ -56,11 +56,6 @@
       <artifactId>curator-recipes</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
@@ -76,6 +71,12 @@
       <artifactId>httpmime</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

platform-agent/src/main/java/com/flow/platform/agent/AgentManager.java

@@ -18,11 +18,12 @@
 
 import com.flow.platform.domain.Cmd;
 import com.flow.platform.domain.Jsonable;
-import com.flow.platform.util.Logger;
 import com.flow.platform.util.zk.ZKClient;
 import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
+import lombok.Getter;
+import lombok.extern.log4j.Log4j2;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.recipes.cache.ChildData;
 import org.apache.curator.framework.recipes.cache.TreeCacheEvent;
@@ -33,49 +34,32 @@
 /**
  * @author [email protected]
  */
+@Log4j2
 public class AgentManager implements Runnable, TreeCacheListener, AutoCloseable {
 
-    private final static Logger LOGGER = new Logger(AgentManager.class);
-
     // Zk root path /flow-agents/{zone}/{name}
     private final static Object STATUS_LOCKER = new Object();
 
     private final static int ZK_RECONNECT_TIME = 1;
-    private final static int ZK_RETRY_PERIOD = 500;
 
-    private String zkHost;
-    private int zkTimeout;
-    private ZKClient zkClient;
+    private final static int ZK_RETRY_PERIOD = 500;
 
-    private String zone; // agent running zone
-    private String name; // agent name, can be machine name
+    @Getter
+    private final ZKClient zkClient;
 
-    private String zonePath;    // zone path, /flow-agents/{zone}
-    private String nodePath;    // zk node path, /flow-agents/{zone}/{name}
+    @Getter
+    private final String zonePath;    // zone path, /flow-agents/{zone}
 
-    private List<Cmd> cmdHistory = new LinkedList<>();
+    @Getter
+    private final String nodePath;    // zk node path, /flow-agents/{zone}/{name}
 
-    public AgentManager(String zkHost, int zkTimeout, String zone, String name) throws IOException {
-        this.zkHost = zkHost;
-        this.zkTimeout = zkTimeout;
+    @Getter
+    private final List<Cmd> cmdHistory = new LinkedList<>();
 
+    public AgentManager(String zkHost, int zkTimeout, String zone, String name) {
         this.zkClient = new ZKClient(zkHost, ZK_RETRY_PERIOD, ZK_RECONNECT_TIME);
-        this.zone = zone;
-        this.name = name;
-        this.zonePath = ZKPaths.makePath(Config.ZK_ROOT, this.zone);
-        this.nodePath = ZKPaths.makePath(this.zonePath, this.name);
-    }
-
-    public ZKClient getZkClient() {
-        return zkClient;
-    }
-
-    public String getNodePath() {
-        return nodePath;
-    }
-
-    public List<Cmd> getCmdHistory() {
-        return cmdHistory;
+        this.zonePath = ZKPaths.makePath(Config.ZK_ROOT, zone);
+        this.nodePath = ZKPaths.makePath(this.zonePath, name);
     }
 
     /**
@@ -98,56 +82,38 @@ public void run() {
             try {
                 STATUS_LOCKER.wait();
             } catch (InterruptedException e) {
-                LOGGER.warn("InterruptedException : " + e.getMessage());
+                log.warn("InterruptedException : " + e.getMessage());
             }
         }
     }
 
     private void exit() {
-        LOGGER.info("One Agent is running in other place. Please first to stop another agent, thx!");
+        log.info("One Agent is running in other place. Please first to stop another agent, thx!");
         Runtime.getRuntime().exit(1);
     }
 
     @Override
-    public void childEvent(CuratorFramework client, TreeCacheEvent event) throws Exception {
+    public void childEvent(CuratorFramework client, TreeCacheEvent event) {
         ChildData eventData = event.getData();
+        log.trace("========= Event: {} =========", event.getType());
 
         if (event.getType() == Type.CONNECTION_RECONNECTED) {
-            LOGGER.traceMarker("ZK-Event", "========= Reconnect =========");
             registerZkNodeAndWatch();
             return;
         }
 
-        if (event.getType() == Type.CONNECTION_LOST) {
-            LOGGER.traceMarker("ZK-Event", "========= Lost =========");
-            return;
-        }
-
-        if (event.getType() == Type.INITIALIZED) {
-            LOGGER.traceMarker("ZK-Event", "========= Initialized =========");
-            return;
-        }
-
-        if (event.getType() == Type.NODE_ADDED) {
-            LOGGER.traceMarker("ZK-Event", "========= Node Added: %s =========", eventData.getPath());
-            return;
-        }
-
         if (event.getType() == Type.NODE_UPDATED) {
-            LOGGER.traceMarker("ZK-Event", "========= Node Updated: %s =========", eventData.getPath());
             onDataChanged(eventData.getPath());
             return;
         }
 
         if (event.getType() == Type.NODE_REMOVED) {
-            LOGGER.traceMarker("ZK-Event", "========= Node Removed: %s =========", eventData.getPath());
             close();
-            return;
         }
     }
 
     @Override
-    public void close() throws IOException {
+    public void close() {
         removeZkNode();
         stop();
     }
@@ -158,7 +124,7 @@ public void close() throws IOException {
     private void onDeleted() {
         try {
             CmdManager.getInstance().shutdown(null);
-            LOGGER.trace("========= Agent been deleted =========");
+            log.trace("========= Agent been deleted =========");
 
             stop();
         } finally {
@@ -172,22 +138,22 @@ private void onDataChanged(String path) {
         try {
             final byte[] rawData = zkClient.getData(path);
             if (rawData == null) {
-                LOGGER.warn("Zookeeper node data is null");
+                log.warn("Zookeeper node data is null");
                 return;
             }
 
             cmd = Jsonable.parse(rawData, Cmd.class);
             if (cmd == null) {
-                LOGGER.warn("Unable to parse cmd from zk node: " + new String(rawData));
+                log.warn("Unable to parse cmd from zk node: " + new String(rawData));
                 return;
             }
 
             cmdHistory.add(cmd);
-            LOGGER.trace("Received command: " + cmd.toString());
+            log.trace("Received command: " + cmd.toString());
             CmdManager.getInstance().execute(cmd);
 
         } catch (Throwable e) {
-            LOGGER.error("Invalid cmd from server", e);
+            log.error("Invalid cmd from server", e);
             // TODO: should report agent status directly...
         }
     }

platform-agent/src/main/java/com/flow/platform/agent/App.java

@@ -16,16 +16,14 @@
 
 package com.flow.platform.agent;
 
-import com.flow.platform.util.Logger;
-import java.io.IOException;
+import lombok.extern.log4j.Log4j2;
 
 /**
  * @author [email protected]
  */
+@Log4j2
 public class App {
 
-    private final static Logger LOGGER = new Logger(App.class);
-
     private static AgentManager agentManager;
 
     public static void main(String args[]) {
@@ -42,38 +40,38 @@ public static void main(String args[]) {
             token = args[1];
         }
 
-        LOGGER.trace("========= Flow Agent Started =========");
-        LOGGER.trace("=== Server: " + baseUrl);
-        LOGGER.trace("=== Token:  " + token);
+        log.trace("========= Flow Agent Started =========");
+        log.trace("=== Server: " + baseUrl);
+        log.trace("=== Token:  " + token);
 
         Runtime.getRuntime().addShutdownHook(new ShutdownHook());
 
         try {
-            LOGGER.trace("=== Start to load configuration");
+            log.trace("=== Start to load configuration");
 
             Config.AGENT_SETTINGS = Config.loadAgentConfig(baseUrl, token);
-            LOGGER.trace("====== Settings: %s", Config.agentSettings());
+            log.trace("====== Settings: {}", Config.agentSettings());
 
             Config.ZK_URL = Config.AGENT_SETTINGS.getZookeeperUrl();
-            LOGGER.trace("====== Zookeeper host: %s", Config.zkUrl());
+            log.trace("====== Zookeeper host: {}", Config.zkUrl());
 
             Config.ZONE = Config.AGENT_SETTINGS.getAgentPath().getZone();
-            LOGGER.trace("====== Working zone: %s", Config.zone());
+            log.trace("====== Working zone: {}", Config.zone());
 
             Config.NAME = Config.AGENT_SETTINGS.getAgentPath().getName();
-            LOGGER.trace("====== Agent agent: %s", Config.name());
+            log.trace("====== Agent agent: {}", Config.name());
 
-            LOGGER.trace("========= Config initialized =========");
+            log.trace("========= Config initialized =========");
         } catch (Throwable e) {
-            LOGGER.error("Cannot load agent config from zone", e);
+            log.error("Cannot load agent config from zone", e);
             Runtime.getRuntime().exit(1);
         }
 
         try {
             agentManager = new AgentManager(Config.zkUrl(), Config.zkTimeout(), Config.zone(), Config.name());
             new Thread(agentManager).start();
         } catch (Throwable e) {
-            LOGGER.error("Got exception when agent running", e);
+            log.error("Got exception when agent running", e);
             Runtime.getRuntime().exit(1);
         }
     }
@@ -83,15 +81,11 @@ private static class ShutdownHook extends Thread {
         @Override
         public void run() {
             if (agentManager != null) {
-                try {
-                    agentManager.close();
-                } catch (IOException ignore) {
-
-                }
+                agentManager.close();
             }
 
-            LOGGER.trace("========= Agent end =========");
-            LOGGER.trace("========= JVM EXIT =========");
+            log.trace("========= Agent end =========");
+            log.trace("========= JVM EXIT =========");
         }
     }
 }

platform-agent/src/main/java/com/flow/platform/agent/CmdManager.java

@@ -25,7 +25,6 @@
 import com.flow.platform.domain.CmdStatus;
 import com.flow.platform.domain.CmdType;
 import com.flow.platform.domain.Jsonable;
-import com.flow.platform.util.Logger;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import java.time.ZonedDateTime;
@@ -39,17 +38,17 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import lombok.extern.log4j.Log4j2;
 
 /**
  * Singleton class to handle command
  * <p>
  *
  * @author [email protected]
  */
+@Log4j2
 public class CmdManager {
 
-    private final static Logger LOGGER = new Logger(CmdManager.class);
-
     private final static CmdManager INSTANCE = new CmdManager();
 
     public static CmdManager getInstance() {
@@ -129,12 +128,12 @@ public void shutdown(String password) {
             }
 
             if (password == null) {
-                LOGGER.trace("Shutdown cannot be executed since sudo password is null");
+                log.trace("Shutdown cannot be executed since sudo password is null");
                 return;
             }
 
             String shutdownCmd = String.format("echo %s | sudo -S shutdown -h now", password);
-            LOGGER.trace("Shutdown command: " + shutdownCmd);
+            log.trace("Shutdown command: " + shutdownCmd);
 
             // exec shutdown command
             CmdExecutor executor = new CmdExecutor(null, Lists.newArrayList(shutdownCmd));
@@ -155,7 +154,7 @@ public void execute(final Cmd cmd) {
             // check max concurrent proc
             int max = cmdExecutor.getMaximumPoolSize();
             int cur = cmdExecutor.getActiveCount();
-            LOGGER.trace(" ===== CmdExecutor: max=%s, current=%s =====", max, cur);
+            log.trace(" ===== CmdExecutor: max={}, current={} =====", max, cur);
 
             // reach max proc number, reject this execute
             if (max == cur) {
@@ -166,7 +165,7 @@ public void execute(final Cmd cmd) {
             cmdExecutor.execute(new TaskRunner(cmd) {
                 @Override
                 public void run() {
-                    LOGGER.debug("start cmd ...");
+                    log.debug("start cmd ...");
 
                     LogEventHandler logListener = new LogEventHandler(getCmd());
 
@@ -185,7 +184,7 @@ public void run() {
 
                         executor.run();
                     } catch (Throwable e) {
-                        LOGGER.errorMarker("execute", "Cannot init CmdExecutor for cmd " + cmd, e);
+                        log.error("Cannot init CmdExecutor for cmd: " + cmd, e);
                         CmdResult result = new CmdResult();
                         result.getExceptions().add(e);
                         procEventHandler.onException(result);
@@ -268,7 +267,7 @@ public synchronized void kill() {
             r.getProcess().destroy();
 
             ReportManager.getInstance().cmdReportSync(cmd.getId(), CmdStatus.KILLED, r);
-            LOGGER.trace("Kill process : %s", r.toString());
+            log.trace("Kill process : {}", r.toString());
         }
 
         try {
@@ -277,7 +276,7 @@ public synchronized void kill() {
 
         } finally {
             cmdExecutor = createExecutor(); // reset cmd executor
-            LOGGER.trace("Cmd thread terminated");
+            log.trace("Cmd thread terminated");
         }
     }
 
@@ -292,7 +291,7 @@ private void onReject(final Cmd cmd) {
 
         rejected.put(cmd, rejectResult);
         ReportManager.getInstance().cmdReportSync(cmd.getId(), CmdStatus.REJECTED, null);
-        LOGGER.warn("Reject cmd '%s' since over the limit proc of agent", cmd.getId());
+        log.warn("Reject cmd '{}' since over the limit proc of agent", cmd.getId());
     }
 
     private ThreadPoolExecutor createExecutor() {
@@ -307,7 +306,7 @@ private ThreadPoolExecutor createExecutor() {
                 if (r instanceof TaskRunner) {
                     TaskRunner task = (TaskRunner) r;
                     onReject(task.getCmd());
-                    LOGGER.warn("Reject cmd: %s", task.getCmd());
+                    log.warn("Reject cmd: {}", task.getCmd());
                 }
             });
     }