From a119c860a30fb12edae0a8acd287967169e91f6e Mon Sep 17 00:00:00 2001
From: Jason Mulligan <jamullig@adobe.com>
Date: Wed, 14 Oct 2015 16:28:03 -0400
Subject: [PATCH] Sending a "SIGHUP" to the ps via `kill()`, removing an
unneeded invariant
---
lib/index.js | 2 +-
lib/worker.js | 6 ++----
package.json | 2 +-
src/index.js | 2 +-
src/worker.js | 5 ++---
5 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/lib/index.js b/lib/index.js
index 504c2ad..bd8dacf 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -52,7 +52,7 @@ var Worker = (function () {
}, {
key: "terminate",
value: function terminate() {
- this.child.kill();
+ this.child.kill("SIGHUP");
}
}]);
diff --git a/lib/worker.js b/lib/worker.js
index b4d2b7b..3c7576a 100644
--- a/lib/worker.js
+++ b/lib/worker.js
@@ -47,8 +47,7 @@ process.once("message", function (obj) {
global.require = require;
global.importScripts = function () {
- var script = undefined,
- scripts = undefined;
+ var scripts = undefined;
for (var _len = arguments.length, files = Array(_len), _key = 0; _key < _len; _key++) {
files[_key] = arguments[_key];
@@ -59,8 +58,7 @@ process.once("message", function (obj) {
return fs.readFileSync(file, "utf8");
}).join("\n");
- script = vm.createScript(scripts);
- script.runInThisContext();
+ vm.createScript(scripts).runInThisContext();
}
};
diff --git a/package.json b/package.json
index 1a42348..939f16d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "tiny-worker",
- "version": "1.1.0",
+ "version": "1.1.1",
"description": "Tiny WebWorker for Server",
"main": "lib/index.js",
"scripts": {
diff --git a/src/index.js b/src/index.js
index 5914921..85674f8 100644
--- a/src/index.js
+++ b/src/index.js
@@ -38,7 +38,7 @@ class Worker {
}
terminate () {
- this.child.kill();
+ this.child.kill("SIGHUP");
}
}
diff --git a/src/worker.js b/src/worker.js
index 11a8494..b3bfb67 100644
--- a/src/worker.js
+++ b/src/worker.js
@@ -45,15 +45,14 @@ process.once("message", function (obj) {
global.require = require;
global.importScripts = function (...files) {
- let script, scripts;
+ let scripts;
if (files.length > 0) {
scripts = files.map(function (file) {
return fs.readFileSync(file, "utf8");
}).join("\n");
- script = vm.createScript(scripts);
- script.runInThisContext();
+ vm.createScript(scripts).runInThisContext();
}
};
--
GitLab