src: use internal/errors for startSigintWatchdog

jasnell · jasnell · commit 0d89d4d284b3 · 2017-10-29T17:39:19.000-07:00
Move the throw out of c++ and into js using internal/errors
diff --git a/doc/api/errors.md b/doc/api/errors.md
@@ -1247,6 +1247,14 @@ range.
 
 Used by the `REPL` module when it cannot parse data from the REPL history file.
 
+<a id="ERR_REPL_STARTSIGINTWATCHDOG_FAILED"></a>
+### ERR_REPL_STARTSIGINTWATCHDOG_FAILED
+
+The `SigintWatchdog` is an internal utility used by the `repl` module to
+monitor for interupt (`SIGINT`) signals received by the process. If this
+utility cannot be started, the `repl` will not function correctly, so an
+error is thrown.
+
 <a id="ERR_REQUIRE_ESM"></a>
 ### ERR_REQUIRE_ESM
 
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
@@ -310,6 +310,7 @@ E('ERR_NO_LONGER_SUPPORTED', '%s is no longer supported');
 E('ERR_OUTOFMEMORY', 'Out of memory');
 E('ERR_OUT_OF_RANGE', 'The "%s" argument is out of range');
 E('ERR_PARSE_HISTORY_DATA', 'Could not parse history data in %s');
+E('ERR_REPL_STARTSIGINTWATCHDOG_FAILED', 'startSigintWatchdog Failed');
 E('ERR_REQUIRE_ESM', 'Must use import to load ES Module: %s');
 E('ERR_SERVER_ALREADY_LISTEN',
   'Listen method has been called more than once without closing.');
diff --git a/lib/repl.js b/lib/repl.js
@@ -227,7 +227,8 @@ function REPLServer(prompt,
       if (self.breakEvalOnSigint) {
         // Start the SIGINT watchdog before entering raw mode so that a very
         // quick Ctrl+C doesn't lead to aborting the process completely.
-        utilBinding.startSigintWatchdog();
+        if (!utilBinding.startSigintWatchdog())
+          throw new errors.Error('ERR_REPL_STARTSIGINTWATCHDOG_FAILED');
         previouslyInRawMode = self._setRawMode(false);
       }
 
diff --git a/src/node_util.cc b/src/node_util.cc
@@ -135,10 +135,7 @@ static void SetHiddenValue(const FunctionCallbackInfo<Value>& args) {
 
 void StartSigintWatchdog(const FunctionCallbackInfo<Value>& args) {
   int ret = SigintWatchdogHelper::GetInstance()->Start();
-  if (ret != 0) {
-    Environment* env = Environment::GetCurrent(args);
-    env->ThrowErrnoException(ret, "StartSigintWatchdog");
-  }
+  args.GetReturnValue().Set(ret == 0);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,8 @@ function REPLServer(prompt,`
`227`	`227`	`if (self.breakEvalOnSigint) {`
`228`	`228`	`// Start the SIGINT watchdog before entering raw mode so that a very`
`229`	`229`	`// quick Ctrl+C doesn't lead to aborting the process completely.`
`230`		`- utilBinding.startSigintWatchdog();`
	`230`	`+ if (!utilBinding.startSigintWatchdog())`
	`231`	`+ throw new errors.Error('ERR_REPL_STARTSIGINTWATCHDOG_FAILED');`
`231`	`232`	`previouslyInRawMode = self._setRawMode(false);`
`232`	`233`	`}`
`233`	`234`
Original file line number	Diff line number	Diff line change
`@@ -135,10 +135,7 @@ static void SetHiddenValue(const FunctionCallbackInfo<Value>& args) {`
`135`	`135`
`136`	`136`	`void StartSigintWatchdog(const FunctionCallbackInfo<Value>& args) {`
`137`	`137`	`int ret = SigintWatchdogHelper::GetInstance()->Start();`
`138`		`- if (ret != 0) {`
`139`		`- Environment* env = Environment::GetCurrent(args);`
`140`		`- env->ThrowErrnoException(ret, "StartSigintWatchdog");`
`141`		`- }`
	`138`	`+ args.GetReturnValue().Set(ret == 0);`
`142`	`139`	`}`
`143`	`140`
`144`	`141`