Merge pull request #36 from yassineazzouz/master

Change logging from context logger to stdout + add missed stderr logging from stream logging

Author: yassineazzouz

src/main/java/com/batix/rundeck/AnsibleFailureReason.java

@@ -5,5 +5,8 @@
 public enum AnsibleFailureReason implements FailureReason {
   AnsibleNonZero, // Ansible process exited with non-zero value
   AnsibleError, // Ansible not found etc.
-  StorageTierAccessError
+  StorageTierAccessError,
+  Interrupted,
+  IOFailure,
+  Unknown
 }

src/main/java/com/batix/rundeck/AnsibleFileCopier.java

@@ -13,6 +13,7 @@
 import com.dtolabs.rundeck.core.plugins.configuration.PropertyUtil;
 import com.dtolabs.rundeck.plugins.ServiceNameConstants;
 import com.dtolabs.rundeck.plugins.util.DescriptionBuilder;
+import com.dtolabs.rundeck.plugins.PluginLogger;
 
 import java.io.File;
 import java.io.InputStream;
@@ -59,7 +60,9 @@ private String doFileCopy(
     final INodeEntry node,
     String destinationPath
   ) throws FileCopierException {
+
     IRundeckProject project = context.getFramework().getFrameworkProjectMgr().getFrameworkProject(context.getFrameworkProject());
+
     if (destinationPath == null) {
       String identity = (context.getDataContext() != null && context.getDataContext().get("job") != null) ?
         context.getDataContext().get("job").get("execid") : null;
@@ -93,10 +96,6 @@ private String doFileCopy(
       throw new FileCopierException("Error running Ansible.", AnsibleFailureReason.AnsibleError, e);
     }
 
-    if (result != 0) {
-      throw new FileCopierException("Ansible exited with non-zero code.", AnsibleFailureReason.AnsibleNonZero);
-    }
-
     return destinationPath;
   }
 

src/main/java/com/batix/rundeck/AnsibleModuleNodeStep.java

@@ -29,28 +29,18 @@ public void executeNodeStep(PluginStepContext context, Map<String, Object> confi
     String sshPass = (String) configuration.get("sshPassword");
     final PluginLogger logger = context.getLogger();
 
-    AnsibleRunner runner = AnsibleRunner.adHoc(module, args).limit(entry.getNodename()).extraArgs(extraArgs).sshPass(sshPass).stream();
+    AnsibleRunner runner = AnsibleRunner.adHoc(module, args).limit(entry.getNodename()).extraArgs(extraArgs).sshPass(sshPass);
+
     if ("true".equals(System.getProperty("ansible.debug"))) {
       runner.debug();
     }
 
-    runner.listener(new AnsibleRunner.Listener() {
-      @Override
-      public void output(String line) {
-        logger.log(Project.MSG_INFO, line);
-      }
-    });
-
     int result;
     try {
       result = runner.run();
     } catch (Exception e) {
       throw new NodeStepException("Error running Ansible.", e, AnsibleFailureReason.AnsibleError, entry.getNodename());
     }
-
-    if (result != 0) {
-      throw new NodeStepException("Ansible exited with non-zero code.", AnsibleFailureReason.AnsibleNonZero, entry.getNodename());
-    }
   }
 
   @Override

src/main/java/com/batix/rundeck/AnsibleModuleWorkflowStep.java

@@ -28,27 +28,17 @@ public void executeStep(PluginStepContext context, Map<String, Object> configura
     String sshPass = (String) configuration.get("sshPassword");
     final PluginLogger logger = context.getLogger();
 
-    AnsibleRunner runner = AnsibleRunner.adHoc(module, args).limit(context.getNodes()).extraArgs(extraArgs).sshPass(sshPass).stream();
+    AnsibleRunner runner = AnsibleRunner.adHoc(module, args).limit(context.getNodes()).extraArgs(extraArgs).sshPass(sshPass);
+    
     if ("true".equals(System.getProperty("ansible.debug"))) {
       runner.debug();
     }
 
-    runner.listener(new AnsibleRunner.Listener() {
-      @Override
-      public void output(String line) {
-        logger.log(Project.MSG_INFO, line);
-      }
-    });
-
     int result;
     try {
-      result = runner.run();
+        result = runner.run();
     } catch (Exception e) {
-      throw new StepException("Error running Ansible.", e, AnsibleFailureReason.AnsibleError);
-    }
-
-    if (result != 0) {
-      throw new StepException("Ansible exited with non-zero code.", AnsibleFailureReason.AnsibleNonZero);
+        throw new StepException("Error running Ansible.", e, AnsibleFailureReason.AnsibleError);
     }
   }
 

src/main/java/com/batix/rundeck/AnsibleNodeExecutor.java

@@ -4,6 +4,7 @@
 import com.dtolabs.rundeck.core.common.IRundeckProject;
 import com.dtolabs.rundeck.core.common.ProjectManager;
 import com.dtolabs.rundeck.core.execution.ExecutionContext;
+import com.dtolabs.rundeck.plugins.PluginLogger;
 import com.dtolabs.rundeck.core.execution.service.NodeExecutor;
 import com.dtolabs.rundeck.core.execution.service.NodeExecutorResult;
 import com.dtolabs.rundeck.core.execution.service.NodeExecutorResultImpl;
@@ -23,6 +24,7 @@ public class AnsibleNodeExecutor implements NodeExecutor, Describable {
 
   @Override
   public NodeExecutorResult executeCommand(ExecutionContext context, String[] command, INodeEntry node) {
+
     StringBuilder cmdArgs = new StringBuilder();
     ProjectManager projectManager = context.getFramework().getProjectManager();
     IRundeckProject project = projectManager.getFrameworkProject(context.getFrameworkProject());
@@ -35,37 +37,18 @@ public NodeExecutorResult executeCommand(ExecutionContext context, String[] comm
     String extraArgs = project.hasProperty("extraArgs") ? project.getProperty("extraArgs") : null;
 
     AnsibleRunner runner = AnsibleRunner.adHoc("shell", cmdArgs.toString()).limit(node.getNodename()).extraArgs(extraArgs);
+
     if ("true".equals(System.getProperty("ansible.debug"))) {
       runner.debug();
     }
+
     int result;
     try {
       result = runner.run();
     } catch (Exception e) {
-      System.out.println(e.getMessage());
-      e.printStackTrace();
       return NodeExecutorResultImpl.createFailure(AnsibleFailureReason.AnsibleError, e.getMessage(), e, node, runner.getResult());
     }
 
-    JsonObject json = runner.getResults().get(0).results.size() > 0 ? runner.getResults().get(0).results.get(0).json : null;
-
-    if (json != null && json.has("stdout")) {
-      String string = json.get("stdout").getAsString();
-      if (string != null && string.length() > 0) {
-        System.out.println(string);
-      }
-    }
-    if (json != null && json.has("stderr")) {
-      String string = json.get("stderr").getAsString();
-      if (string != null && string.length() > 0) {
-        System.err.println(string);
-      }
-    }
-
-    if (result != 0) {
-      return NodeExecutorResultImpl.createFailure(AnsibleFailureReason.AnsibleNonZero, "Ansible exited with non-zero code.", node, result);
-    }
-
     return NodeExecutorResultImpl.createSuccess(node);
   }
 

src/main/java/com/batix/rundeck/AnsiblePlaybookNodeStep.java

@@ -47,28 +47,18 @@ public void executeNodeStep(PluginStepContext context, Map<String, Object> confi
         vaultPass = "";
     }
 
-    AnsibleRunner runner = AnsibleRunner.playbook(playbook).limit(entry.getNodename()).extraArgs(extraArgs).vaultPass(vaultPass).sshPass(sshPass).stream();
+    AnsibleRunner runner = AnsibleRunner.playbook(playbook).limit(entry.getNodename()).extraArgs(extraArgs).vaultPass(vaultPass).sshPass(sshPass);
 
     if (jobConfig.get("loglevel").equals("DEBUG")) {
       runner.debug();
     }
 
-    runner.listener(new AnsibleRunner.Listener() {
-      @Override
-      public void output(String line) {
-        logger.log(Project.MSG_INFO, line);
-      }
-    });
-
-    int result;
     try {
-      result = runner.run();
+        runner.run();
+    } catch (AnsibleStepException e) {
+        throw new NodeStepException("Error running Ansible Node Step.", e, e.getFailureReason(), entry.getNodename());
     } catch (Exception e) {
-      throw new NodeStepException("Error running Ansible.", e, AnsibleFailureReason.AnsibleError, entry.getNodename());
-    }
-
-    if (result != 0) {
-      throw new NodeStepException("Ansible exited with non-zero code.", AnsibleFailureReason.AnsibleNonZero, entry.getNodename());
+        throw new NodeStepException(e.getMessage(), e, AnsibleFailureReason.AnsibleError, entry.getNodename());
     }
   }
 

src/main/java/com/batix/rundeck/AnsiblePlaybookWorkflowStep.java

@@ -45,28 +45,21 @@ public void executeStep(PluginStepContext context, Map<String, Object> configura
         vaultPass = "";
     }
 
-    AnsibleRunner runner = AnsibleRunner.playbook(playbook).limit(context.getNodes()).extraArgs(extraArgs).vaultPass(vaultPass).sshPass(sshPass).stream();
+    // Configure the ansible runner
+    AnsibleRunner runner = AnsibleRunner.playbook(playbook).limit(context.getNodes()).extraArgs(extraArgs).vaultPass(vaultPass).sshPass(sshPass);
 
+    // Set the logging level
     if (jobConfig.get("loglevel").equals("DEBUG")) {
       runner.debug();
     }
 
-    runner.listener(new AnsibleRunner.Listener() {
-      @Override
-      public void output(String line) {
-        logger.log(Project.MSG_INFO, line);
-      }
-    });
-
-    int result;
+    // ansible runner will take care of handling exceptions, here handle only jobs specific stuff
     try {
-      result = runner.run();
+        runner.run();
+    } catch (AnsibleStepException e) {
+        throw new StepException(e.getMessage(), e, e.getFailureReason());
     } catch (Exception e) {
-      throw new StepException("Error running Ansible.", e, AnsibleFailureReason.AnsibleError);
-    }
-
-    if (result != 0) {
-      throw new StepException("Ansible exited with non-zero code.", AnsibleFailureReason.AnsibleNonZero);
+        throw new StepException(e.getMessage(),e,AnsibleFailureReason.AnsibleError);
     }
   }
 

src/main/java/com/batix/rundeck/AnsibleResourceModelSource.java

@@ -68,9 +68,6 @@ public INodeSet getNodes() throws ResourceModelSourceException {
 
     try {
       int status = runner.run();
-      if (status != 0) {
-        System.out.println("error gathering facts:\n" + runner.getOutput());
-      }
     } catch (Exception e) {
       throw new ResourceModelSourceException("Error running playbook.", e);
     }