Merge pull request #738 from null-a/fix-readable-errors

Make error handling work when resuming trampoline.
probmods · Dec 20, 2016 · 0db8ab1 · 0db8ab1
2 parents ebab602 + d9e35ad
commit 0db8ab1
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 22 deletions.
diff --git a/src/main.js b/src/main.js
@@ -218,6 +218,9 @@ function prepare(codeAndAssets, k, options) {
   var currentAddress = {value: undefined};
   var defaultHandler = function(error) {
     errors.extendError(error, codeAndAssets, currentAddress);
+    // Trigger clean-up. When using the mongo store, the process won't
+    // exit until the connection is closed.
+    cleanup(_.identity);
     throw error;
   };
   var allErrorHandlers = [defaultHandler].concat(options.errorHandlers);
@@ -232,8 +235,9 @@ function prepare(codeAndAssets, k, options) {
 
   // Before the program finishes, we tell the param store to finish up
   // gracefully (e.g., shutting down a connection to a remote store).
+  var cleanup = params.stop;
   var finish = function(s, x) {
-    return params.stop(function() {
+    return cleanup(function() {
       return k(s, x);
     });
   };

diff --git a/webppl b/webppl
@@ -25,28 +25,29 @@ function run(code, packages, verbose, debug, programFile) {
     pkg.headers.forEach(webppl.requireHeader);
   });
 
-  try {
-    webppl.run(code, topK, {
-      bundles: webppl.parsePackageCode(packages, verbose),
-      filename: programFile,
-      verbose: verbose,
-      debug: debug
-    });
-  } catch (error) {
-    if (error instanceof Error && error.wpplRuntimeError) {
-      try {
-        var stack = errors.recoverStack(error, parseV8);
-        showError(error, stack, programFile, debug);
-        process.exitCode = 1;
-      } catch (e) {
-        // If we fail to generate a readable error message re-throw
-        // the original error.
-        throw error;
+  webppl.run(code, topK, {
+    bundles: webppl.parsePackageCode(packages, verbose),
+    filename: programFile,
+    verbose: verbose,
+    debug: debug,
+    errorHandlers: [
+      function(error) {
+        if (error instanceof Error && error.wpplRuntimeError) {
+          try {
+            var stack = errors.recoverStack(error, parseV8);
+            showError(error, stack, programFile, debug);
+            process.exitCode = 1;
+          } catch (e) {
+            // If we fail to generate a readable error message re-throw
+            // the original error.
+            throw error;
+          }
+        } else {
+          throw error;
+        }
       }
-    } else {
-      throw error;
-    }
-  }
+    ]
+  });
 }
 
 var lines = function(ar) {