@pixlcore/xyrun 1.0.0 → 1.0.2

package/README.md

@@ -2,7 +2,7 @@
 
 **xyOps Remote Job Runner (xyRun)** is a companion to the [xyOps](https://xyops.io) workflow automation and server monitoring platform.  It is a wrapper for running remote jobs inside Docker containers, or over a remote SSH connection.
 
-The idea is that when a job is running "remotely" (i.e. not a direct child process of [xySat](https://github.com/pixlcore/xysat)) then we cannot monitor system resources for the job.  Also, input and output files simply do not work in these cases (because xySat expects them to be on the local filesystem where it is running).  xyRun handles all these complexites for you by sitting "in between" your job and xySat.  xyRun should run *inside* the container or on the far end of the SSH connection, where your job process is running.
+The idea is that when a job is running "remotely" (i.e. not a direct child process of [xySat](https://github.com/pixlcore/xysat)) then we cannot monitor system resources for the job.  Also, input and output files simply do not work in these cases (because xySat expects them to be on the local filesystem where it is running).  xyRun handles all these complexities for you by sitting "in between" your job and xySat.  xyRun should run *inside* the container or on the far end of the SSH connection, where your job process is running.
 
 To use xyRun in a xyOps Event Plugin, make sure you set the Plugin's `runner` property to `true`.  This hint tells xyOps (and ultimately xySat) that the job is running remotely out if its reach, and it should not perform the usual process and network monitoring, and file management.  Those duties get delegated to xyRun.
 

package/main.js

@@ -12,7 +12,11 @@ const JSONStream = require('pixl-json-stream');
 const PixlRequest = require('pixl-request');
 const Tools = require('pixl-tools');
 const pkg = require('./package.json');
+
 const noop = function() {};
+const async = Tools.async;
+
+process.title = "xyRun";
 
 const app = {
 	
@@ -434,9 +438,6 @@ const app = {
 				
 				if (!file.path) return; // sanity
 				
-				// prepend job cwd if path is not absolute
-				if (!Path.isAbsolute(file.path)) file.path = Path.join(job.cwd, file.path);
-				
 				if (file.filename) {
 					// if user specified a custom filename, then do not perform a glob
 					to_upload.push(file);
@@ -461,7 +462,7 @@ const app = {
 		// upload all job files (from user) if applicable
 		var self = this;
 		var final_files = [];
-		var server_id = job.server;
+		
 		if (!job.files || !job.files.length || !Tools.isaArray(job.files)) return callback();
 		
 		async.eachSeries( job.files,
@@ -501,7 +502,7 @@ const app = {
 						filename: filename, 
 						path: json.key, 
 						size: json.size, 
-						server: server_id, 
+						server: job.server, 
 						job: job.id 
 					});
 					
@@ -565,8 +566,8 @@ const app = {
 						return;
 					}
 					
-					// update job data
-					console.log( JSON.stringify({ xy: 1, procs: job.procs, conns: job.conns, cpu: job.cpu, mem: job.mem }) );
+					// update job data with stats in tow
+					console.log( JSON.stringify({ xy: 1, rpid: process.pid, procs: job.procs, conns: job.conns, cpu: job.cpu, mem: job.mem }) );
 					
 					self.jobTickInProgress = false;
 				}
@@ -577,20 +578,21 @@ const app = {
 	measureJobResources(job, pids) {
 		// scan process list for all processes that are descendents of job pid
 		delete job.procs;
+		var root_pid = process.pid;
 		
-		if (pids[ job.pid ]) {
+		if (pids[ root_pid ]) {
 			// add all procs into job
 			job.procs = {};
-			job.procs[ job.pid ] = pids[ job.pid ];
+			job.procs[ root_pid ] = pids[ root_pid ];
 			
-			var info = pids[ job.pid ];
+			var info = pids[ root_pid ];
 			var cpu = info.cpu;
 			var mem = info.memRss;
 			
 			// also consider children of the child (up to 100 generations deep)
 			var levels = 0;
 			var family = {};
-			family[ job.pid ] = 1;
+			family[ root_pid ] = 1;
 			
 			while (Tools.numKeys(family) && (++levels <= 100)) {
 				for (var fpid in family) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@pixlcore/xyrun",
-	"version": "1.0.0",
+	"version": "1.0.2",
 	"description": "Remote job runner script for xyOps.",
 	"author": "Joseph Huckaby <jhuckaby@pixlcore.com>",
 	"homepage": "https://github.com/pixlcore/xyrun",