diff --git a/demo/server.js b/demo/server.js index 5f39a19..2e63887 100644 --- a/demo/server.js +++ b/demo/server.js @@ -1,5 +1,5 @@ // Copyright IBM Corp. 2012,2016. All Rights Reserved. -// Node module: foreman +// Node module: procfiled // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT diff --git a/forward.js b/forward.js index 2243c37..6fee840 100644 --- a/forward.js +++ b/forward.js @@ -1,5 +1,5 @@ // Copyright IBM Corp. 2012,2016. All Rights Reserved. -// Node module: foreman +// Node module: procfiled // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT diff --git a/lib/proc.js b/lib/proc.js index c9e0021..d9eddff 100644 --- a/lib/proc.js +++ b/lib/proc.js @@ -131,7 +131,7 @@ function start(procs, requirements, envs, portarg, emitter){ }; p.env.PORT = port + j + k * 100; - p.env.FOREMAN_WORKER_NAME = p.env.FOREMAN_WORKER_NAME || key + "." + (i + 1); + p.env.PROCFILED_WORKER_NAME = p.env.PROCFILED_WORKER_NAME || key + "." + (i + 1); run(key + "." + (i + 1), p, emitter); diff --git a/nf.js b/nf.js index 4d0d8a3..c678d71 100755 --- a/nf.js +++ b/nf.js @@ -295,7 +295,7 @@ program } envl.push({ key: "PORT", value: conf.port }); envl.push({ - key: "FOREMAN_WORKER_NAME", + key: "PROCFILED_WORKER_NAME", value: conf.process + "." + conf.number, }); diff --git a/package.json b/package.json index fd0a9a9..5bc9f02 100644 --- a/package.json +++ b/package.json @@ -45,9 +45,9 @@ }, "preferGlobal": true, "devDependencies": { - "chai": "~1.9.1", - "jshint": "^2.6.3", - "rimraf": "~2.2.8", - "tap": "^0.7.1" + "chai": "^4.3.0", + "jshint": "^2.13.0", + "rimraf": "^5.0.0", + "tap": "^18.0.0" } } diff --git a/proxy.js b/proxy.js index 98e037d..c2ba400 100644 --- a/proxy.js +++ b/proxy.js @@ -1,5 +1,5 @@ // Copyright IBM Corp. 2012,2016. All Rights Reserved. -// Node module: foreman +// Node module: procfiled // This file is licensed under the MIT License. // License text available at https://opensource.org/licenses/MIT diff --git a/test/console-output.test.js b/test/console-output.test.js index 090dc40..f5efcd9 100644 --- a/test/console-output.test.js +++ b/test/console-output.test.js @@ -47,7 +47,7 @@ c.log('a key', null, 'a log message'); assertLogged('log', /^a log message$/); c.raw = false; -assert.lengthOf(c.trim('a very long string this is!', 5), 6); +assert.equal(c.trim('a very long string this is!', 5).length, 6); function makeLogger(collector) { return function() { @@ -65,7 +65,7 @@ function assertLogged(logName, pattern) { var actual = logs[logName][logs[logName].length - 1]; Object.keys(logs).forEach(function (log) { - assert.lengthOf(logs[log], logName === log ? 1 : 0); + assert.equal(logs[log].length, logName === log ? 1 : 0); }); assert.match(actual, pattern); diff --git a/test/console-trim.test.js b/test/console-trim.test.js index 20db4e9..37c942c 100644 --- a/test/console-trim.test.js +++ b/test/console-trim.test.js @@ -16,8 +16,8 @@ var blue = colors.blue('blue'); var long = 'Roses are red, Violets are blue, this string is long, and should be trimmed, too!'; var colorLong = long.replace('red', red).replace('blue', blue); -assert.lengthOf(long, 81); -assert.lengthOf(colorLong, 99); +assert.equal(long.length, 81); +assert.equal(colorLong.length, 99); assert.equal(Console.trim(colorLong, 50), Console.trim(long, 50)); assert.equal(Console.trim(colorLong, long.length), colorLong,