Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions lib/LogStream.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
module.exports = LogStream;

var util = require('util');
var stream = require('stream');
var fs = require('fs');

util.inherits(LogStream, stream.Writable);

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function LogStream(fileName) {
var self = this;
stream.Writable.call(this);
self.fileName = fileName;
self.logStream = LogStream._createLogStream(fileName);
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
LogStream.prototype._write = function () {
var self = this;
return self.logStream.write.apply(self.logStream, arguments);
};

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
LogStream.prototype.recreate = function () {
var self = this;
self.logStream.end();
self.logStream = LogStream._createLogStream(self.fileName);
};

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
LogStream._createLogStream = function (fileName) {
return fs.createWriteStream(fileName, {flags: 'a'});
};
33 changes: 25 additions & 8 deletions lib/daemon.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ var assert = require('assert');
var Pend = require('pend');
var jsonSocket = require('./json_socket');
var createLog = require('./log').create;
var LogStream = require('./LogStream');

var own = {}.hasOwnProperty;

Expand Down Expand Up @@ -77,12 +78,10 @@ function startDaemon(argv) {
log: null,
});
} else {
createLog(logPath, maxLogSize, function(err, logStream) {
if (err) return cb(err);
cb(null, {
behavior: 'pipe',
log: logStream,
});
var logStream = new LogStream(logPath);
cb(null, {
behavior: 'pipe',
log: logStream
});
}
}
Expand Down Expand Up @@ -225,7 +224,23 @@ function startDaemon(argv) {
if (msg.action === 'NaughtDeploy') {
extend(process.env, msg.environment);
}
master.send(msg);
if (msg.action === 'NaughtRotate') {
log('NaughtRotate received\n');
if (naughtLog) {
naughtLog.recreate();
}
if (stderrLog) {
stderrLog.recreate();
}
if (stdoutLog) {
stdoutLog.recreate();
}
//var naughtLog = null;
//var stderrLog = null;
//var stdoutLog = null;
} else {
master.send(msg);
}
return null;
} else {
processSend({event: 'Error', value: 'StillBooting'});
Expand Down Expand Up @@ -253,7 +268,9 @@ function extend(obj, src) {

function processSend(msg) {
try {
process.send(msg);
if (process.connected) {
process.send(msg);
}
} catch (err) {
// ignore
}
Expand Down
37 changes: 37 additions & 0 deletions lib/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,43 @@ var cmds = {
}
}
},
'rotate': {
help: "rotate logs",
fn: function (argv) {
var options = {
'worker-count': 0,
'override-env': 'true',
'timeout': 'none',
'cwd': CWD
};
var arr = chompArgv(options, argv)
, err = arr[0]
, ipcFile = arr[1] || DEFAULT_IPC_FILE;
if (!err && argv.length === 0) {
options['override-env'] = options['override-env'] === 'true';
options.timeout = parseFloat(options.timeout);
if (isNaN(options.timeout)) options.timeout = null;

options['worker-count'] = parseInt(options['worker-count'], 10);
if (isNaN(options['worker-count'])) return false;

var socket = getDaemonMessages(ipcFile, {
ready: function(){
json_socket.send(socket, {
action: 'NaughtRotate'
});
process.exit(0);
},
event: function(msg){
printDaemonMsg(msg);
}
});
return true;
} else {
return false;
}
}
},
'deploy-abort': {
help: "naught deploy-abort [ipc-file]\n\n" +

Expand Down