Skip to content

Commit

Permalink
Merge pull request #113 from mmalecki/replace-sys-usages
Browse files Browse the repository at this point in the history
Replace sys usages
  • Loading branch information
indexzero committed Sep 2, 2011
2 parents 00628c2 + 227b158 commit 1170362
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 32 deletions.
4 changes: 2 additions & 2 deletions bin/forever
Expand Up @@ -3,7 +3,7 @@
var path = require('path'),
fs = require('fs'),
winston = require('winston'),
sys = require('sys'),
util = require('util'),
forever = require('./../lib/forever');

var action, accepts = [
Expand Down Expand Up @@ -84,7 +84,7 @@ function isSimpleAction () {
//
if (argv.h || argv.help || (argv._.length === 0 && !isSimpleAction())
&& (!argv.c && !argv.command)) {
return sys.puts(help);
return util.puts(help);
}

var mappings = {
Expand Down
12 changes: 6 additions & 6 deletions examples/chroot.js
@@ -1,14 +1,14 @@
var sys = require('sys'),
var util = require('util'),
daemon = require('daemon'),
fs = require('fs');

daemon.chroot('/tmp/chroot');
sys.puts('Working in chroot');
util.puts('Working in chroot');

setInterval(function () {
fs.readdir('./', function (err, files) {
sys.puts('Current directory: ' + process.cwd());
sys.puts('err: ' + sys.inspect(err));
sys.puts('files: ' + sys.inspect(files));
util.puts('Current directory: ' + process.cwd());
util.puts('err: ' + util.inspect(err));
util.puts('files: ' + util.inspect(files));
});
}, 10000 );
}, 10000 );
4 changes: 2 additions & 2 deletions examples/count-timer.js
Expand Up @@ -6,11 +6,11 @@
*
*/

var sys = require('sys');
var util = require('util');

var count = 0;

var id = setInterval(function () {
sys.puts('Count is ' + count + '. Incrementing now.');
util.puts('Count is ' + count + '. Incrementing now.');
count++;
}, 1000);
4 changes: 2 additions & 2 deletions examples/error-on-timer.js
Expand Up @@ -6,9 +6,9 @@
*
*/

var sys = require('sys');
var util = require('util');

setTimeout(function () {
sys.puts('Throwing error now.');
util.puts('Throwing error now.');
throw new Error('User generated fault.');
}, 200);
4 changes: 2 additions & 2 deletions examples/server.js
@@ -1,4 +1,4 @@
var sys = require('sys'),
var util = require('util'),
http = require('http'),
argv = require('optimist').argv;

Expand All @@ -12,5 +12,5 @@ http.createServer(function (req, res) {
}).listen(port);

/* server started */
sys.puts('> hello world running on port ' + port);
util.puts('> hello world running on port ' + port);

8 changes: 4 additions & 4 deletions examples/spawn-and-error.js
Expand Up @@ -6,21 +6,21 @@
*
*/

var sys = require('sys'),
var util = require('util'),
path = require('path'),
spawn = require('child_process').spawn;

var child = spawn('node', [path.join(__dirname, 'count-timer.js')], { cwd: __dirname });

child.stdout.on('data', function (data) {
sys.puts(data);
util.puts(data);
//throw new Error('User generated fault.');
});

child.stderr.on('data', function (data) {
sys.puts(data);
util.puts(data);
});

child.on('exit', function (code) {
sys.puts('Child process exited with code: ' + code);
util.puts('Child process exited with code: ' + code);
});
3 changes: 1 addition & 2 deletions lib/forever/cli.js
Expand Up @@ -6,8 +6,7 @@
*
*/

var sys = require('sys'),
path = require('path'),
var path = require('path'),
cliff = require('cliff'),
forever = require('../forever');

Expand Down
4 changes: 2 additions & 2 deletions lib/forever/monitor.js
Expand Up @@ -6,7 +6,7 @@
*
*/

var sys = require('sys'),
var util = require('util'),
fs = require('fs'),
path = require('path'),
events = require('events'),
Expand Down Expand Up @@ -117,7 +117,7 @@ var Monitor = exports.Monitor = function (script, options) {
};

// Inherit from events.EventEmitter
sys.inherits(Monitor, events.EventEmitter);
util.inherits(Monitor, events.EventEmitter);

//
// ### function start ([restart])
Expand Down
3 changes: 1 addition & 2 deletions test/env-spawn-test.js
Expand Up @@ -6,8 +6,7 @@
*
*/

var sys = require('sys'),
assert = require('assert'),
var assert = require('assert'),
path = require('path'),
vows = require('vows'),
forever = require('../lib/forever'),
Expand Down
5 changes: 2 additions & 3 deletions test/forever-test.js
Expand Up @@ -6,8 +6,7 @@
*
*/

var sys = require('sys'),
assert = require('assert'),
var assert = require('assert'),
path = require('path'),
vows = require('vows'),
forever = require('../lib/forever'),
Expand Down Expand Up @@ -91,4 +90,4 @@ vows.describe('forever').addBatch({
}
}
}
}).export(module);
}).export(module);
3 changes: 1 addition & 2 deletions test/hook-test.js
Expand Up @@ -6,8 +6,7 @@
*
*/

var sys = require('sys'),
assert = require('assert'),
var assert = require('assert'),
path = require('path'),
vows = require('vows'),
forever = require('../lib/forever'),
Expand Down
1 change: 0 additions & 1 deletion test/multiple-processes-test.js
Expand Up @@ -9,7 +9,6 @@
var assert = require('assert'),
net = require('net'),
path = require('path'),
sys = require('sys'),
vows = require('vows'),
forever = require('../lib/forever');

Expand Down
3 changes: 1 addition & 2 deletions test/spin-test.js
Expand Up @@ -6,8 +6,7 @@
*
*/

var sys = require('sys'),
assert = require('assert'),
var assert = require('assert'),
path = require('path'),
vows = require('vows'),
forever = require('../lib/forever');
Expand Down

0 comments on commit 1170362

Please sign in to comment.