Skip to content

"Fix" repl race condition #1677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
chrisdickinson wants to merge 9 commits into from
Closed

"Fix" repl race condition #1677

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
de5a5f5
repl: "fix" race condition between internal repl histories
chrisdickinson May 11, 2015
ba80aa1
style fix
chrisdickinson May 11, 2015
46e2d68
build: include internal modules in lint
chrisdickinson May 11, 2015
e4f0cfc
@bnoordhuis: use "wx" for writing temp file
chrisdickinson May 12, 2015
9b9dd70
add tmpfile cleanup on repl exit; replace TMP with Temp everywhere
chrisdickinson May 12, 2015
8752fe1
@bnoordhuis: punctuate comments
chrisdickinson May 12, 2015
bdf2b9f
fix repl error state messaging and close on error
chrisdickinson May 12, 2015
821332b
note why we use fs.write vs. writeFile
chrisdickinson May 12, 2015
6158e2d
@silverwind: add "node-" to repl name for clarity
chrisdickinson May 12, 2015
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
Prev Previous commit
Next Next commit
fix repl error state messaging and close on error
  • Loading branch information
@chrisdickinson
chrisdickinson committed May 12, 2015
commit bdf2b9f3a512f2f4147690cd4aa38041373ed45e
7 changes: 6 additions & 1 deletion lib/internal/repl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,12 @@ function createRepl(env, attemptPersistentHistory, cb) {

const repl = REPL.start(opts);
if (env.NODE_REPL_HISTORY_FILE && attemptPersistentHistory) {
return setupHistory(repl, env.NODE_REPL_HISTORY_FILE, cb);
return setupHistory(repl, env.NODE_REPL_HISTORY_FILE, function(err) {
if (err) {
repl.close();
}
cb(err);
});
}
repl._historyPrev = _replHistoryMessage;
cb(null, repl);
Expand Down
6 changes: 5 additions & 1 deletion src/node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,11 @@
var cliRepl = Module.requireRepl();
cliRepl.createInternalRepl(process.env, true, function(err, repl) {
if (err) {
console.log('Encountered error with persistent history support.');
console.error('Encountered error with persistent history support.')
console.error('Run with NODE_DEBUG=repl for more information.');
if (/repl/.test(process.env.NODE_DEBUG || '')) {
console.error(err.stack);
}
return cliRepl.createInternalRepl(
process.env, false, function(err, repl) {
Copy link
Copy Markdown
Contributor Author

@chrisdickinson chrisdickinson May 11, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like an odd style choice, but make jslint didn't complain!

Copy link
Copy Markdown
Contributor

@silverwind silverwind May 12, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The linter is set up pretty conservative right now. Not sure it has a rule for odd linebreaks, but it seems fine to me there.

if (err) {
Expand Down