1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

repl: don't crash if cannot open history file

Browse Source 
Previously, if we are unable to open the history file, an error would
be thrown. Now, print an error message that we could not open
the history file, but don't fail.

Fixes: https://github.com/nodejs/node/issues/3610
PR-URL: https://github.com/nodejs/node/pull/3630
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
This commit is contained in:
Evan Lucas 2015-11-02 09:43:02 -06:00
parent 82022a79b0
commit a4a0efc534
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/internal/repl.js
View File

@ -92,7 +92,16 @@ function setupHistory(repl, historyPath, oldHistoryPath, ready) {
function oninit(err, hnd) { function oninit(err, hnd) {
if (err) { if (err) {
return ready(err); // Cannot open history file.
// Don't crash, just don't persist history.
repl._writeToOutput('\nError: Could not open history file.\n' +
'REPL session history will not be persisted.\n');
repl._refreshLine();
debug(err.stack);
repl._historyPrev = _replHistoryMessage;
repl.resume();
return ready(null, repl);
} }
fs.close(hnd, onclose); fs.close(hnd, onclose);
} }

9
test/sequential/test-repl-persistent-history.js
View File

@ -64,10 +64,13 @@ const convertMsg = '\nConverting old JSON repl history to line-separated ' +
path.join(common.tmpDir, '.node_repl_history') + '.\n'; path.join(common.tmpDir, '.node_repl_history') + '.\n';
const homedirErr = '\nError: Could not get the home directory.\n' + const homedirErr = '\nError: Could not get the home directory.\n' +
'REPL session history will not be persisted.\n'; 'REPL session history will not be persisted.\n';
const replFailedRead = '\nError: Could not open history file.\n' +
'REPL session history will not be persisted.\n';
// File paths // File paths
const fixtures = path.join(common.testDir, 'fixtures'); const fixtures = path.join(common.testDir, 'fixtures');
const historyFixturePath = path.join(fixtures, '.node_repl_history'); const historyFixturePath = path.join(fixtures, '.node_repl_history');
const historyPath = path.join(common.tmpDir, '.fixture_copy_repl_history'); const historyPath = path.join(common.tmpDir, '.fixture_copy_repl_history');
const historyPathFail = path.join(common.tmpDir, '.node_repl\u0000_history');
const oldHistoryPath = path.join(fixtures, 'old-repl-history-file.json'); const oldHistoryPath = path.join(fixtures, 'old-repl-history-file.json');
const enoentHistoryPath = path.join(fixtures, 'enoent-repl-history-file.json'); const enoentHistoryPath = path.join(fixtures, 'enoent-repl-history-file.json');
const defaultHistoryPath = path.join(common.tmpDir, '.node_repl_history'); const defaultHistoryPath = path.join(common.tmpDir, '.node_repl_history');
@ -147,6 +150,12 @@ const tests = [{
test: [UP, UP, UP, CLEAR], test: [UP, UP, UP, CLEAR],
expected: [prompt, convertMsg, prompt, prompt + '\'=^.^=\'', prompt] expected: [prompt, convertMsg, prompt, prompt + '\'=^.^=\'', prompt]
}, },
{
env: { NODE_REPL_HISTORY: historyPathFail,
NODE_REPL_HISTORY_SIZE: 1 },
test: [UP],
expected: [prompt, replFailedRead, prompt, replDisabled, prompt]
},
{ // Make sure this is always the last test, since we change os.homedir() { // Make sure this is always the last test, since we change os.homedir()
before: function mockHomedirFailure() { before: function mockHomedirFailure() {
// Mock os.homedir() failure // Mock os.homedir() failure