fix bug

bigdatas · Aug 31, 2018 · 3ad66cd · 3ad66cd
1 parent 4da793c
commit 3ad66cd
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/jobx-agent/src/main/java/com/jobxhub/agent/process/ExecuteUser.java b/jobx-agent/src/main/java/com/jobxhub/agent/process/ExecuteUser.java
@@ -69,13 +69,14 @@ public static int execute(final String user, final File file, final String comma
 
     public static String buildCommand(final String proxyUser, final File execFile, final String command) {
         AssertUtils.notNull(command);
-        //写入命令到文件
-        write(execFile, command);
 
         if (CommonUtils.isWindows()) {
-            return String.format("call %s",execFile.getAbsolutePath());
+            return command;
         }
 
+        //写入命令到文件
+        write(execFile, command);
+
         String execCmd = String.format("/bin/bash +x %s", execFile.getAbsolutePath());
         if ( CommonUtils.notEmpty(proxyUser)) {
             //授权文件...

diff --git a/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java b/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java
@@ -277,13 +277,16 @@ private Integer getProcessId() {
             if (this.process == null) return null;
             if (CommonUtils.isUnix()) {
                 Field field = ReflectUtils.getField(this.process.getClass(), "pid");
-                return field.getInt(this.process);
+                if (field!=null) {
+                    return field.getInt(this.process);
+                }
             }else if(CommonUtils.isWindows()) {
                 Field field = ReflectUtils.getField(this.process.getClass(), "handle");
-                WinNT.HANDLE handle = new WinNT.HANDLE();
-                long handl = field.getLong(this.process);
-                handle.setPointer(Pointer.createConstant(handl));
-                return Kernel32.INSTANCE.GetProcessId(handle);
+                if (field!=null) {
+                    WinNT.HANDLE handle = new WinNT.HANDLE();
+                    handle.setPointer(Pointer.createConstant(field.getLong(this.process)));
+                    return Kernel32.INSTANCE.GetProcessId(handle);
+                }
             }
         }catch (Exception e) {
             e.printStackTrace();
@@ -343,7 +346,10 @@ private Logger getLogger(String name) {
     }
 
     private File getExecShell(String pid) {
-        return new File(String.format("%s/.%s.%s",Constants.JOBX_TMP_PATH,pid,CommonUtils.isWindows()?"bat":"sh"));
+        if (CommonUtils.isUnix()) {
+            return new File(String.format("%s/.%s.%s",Constants.JOBX_TMP_PATH,pid,"sh"));
+        }
+        return null;
     }
 
     private File getLogFile(String pid) {

diff --git a/jobx-common/src/main/java/com/jobxhub/common/util/CommandUtils.java b/jobx-common/src/main/java/com/jobxhub/common/util/CommandUtils.java
@@ -55,8 +55,6 @@ public abstract class CommandUtils implements Serializable {
 
     public static String BASH_SCHEAM = "#!/bin/bash";
 
-    public static String BAT_SCHEAM = "@echo off";
-
     public static File createShellFile(String command, String shellFileName) {
         String dirPath = IOUtils.getTmpdir();
         File dir = new File(dirPath);
@@ -273,7 +271,7 @@ public static void write(File shellFile, String command) {
         try {
             if (!shellFile.exists()) {
                 PrintWriter out = new PrintWriter(new OutputStreamWriter(new FileOutputStream(shellFile)));
-                out.write(CommonUtils.isWindows()?BAT_SCHEAM:BASH_SCHEAM);
+                out.write(BASH_SCHEAM);
                 out.write("\n\r\n\r");
                 out.write(command);
                 out.flush();

diff --git a/jobx-server/src/main/java/com/jobxhub/server/controller/VerifyController.java b/jobx-server/src/main/java/com/jobxhub/server/controller/VerifyController.java
@@ -70,7 +70,7 @@ public List<String> getRecentTriggerTime(String cronExp) {
     public Map<String,Integer> validatePing(Agent agent) {
         Map<String,Integer> result = new HashMap<String, Integer>(0);
         if (hasProxy(agent, result)) return result;
-        Constants.ConnStatus connStatus = executeService.ping(agent,false);
+        Constants.ConnStatus connStatus = executeService.ping(agent,true);
         result.put("status",connStatus.getValue());
         return result;
     }

diff --git a/jobx-server/src/main/java/com/jobxhub/server/job/JobXRegistry.java b/jobx-server/src/main/java/com/jobxhub/server/job/JobXRegistry.java
@@ -103,9 +103,7 @@ public void initialize() {
         List<Agent> agentList = this.agentService.getAll();
         if (CommonUtils.notEmpty(agentList)) {
             for (Agent agent : agentList) {
-                if(agent.getStatus() == Constants.ConnStatus.DISCONNECTED.getValue()) {
-                    executeService.ping(agent,true);
-                }
+                executeService.ping(agent,true);
             }
         }