Commitee8cf1c

committed

Pass worker errors through to RPC for report error modal

1 parentab93533 commitee8cf1cCopy full SHA for ee8cf1c

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ def api_view(request, method_name):`
`53`	`53`	`exceptException:`
`54`	`54`	`result=dict(`
`55`	`55`	`error=dict(`
`56`		`-traceback="".join(traceback.format_exc()),`
	`56`	`+traceback=traceback.format_exc(),`
`57`	`57`	`)`
`58`	`58`	`)`
`59`	`59`	`returnJsonResponse(result)`
`@@ -95,6 +95,9 @@ def run_code(self, code, source):`
`95`	`95`	`entry.output=result["output"]`
`96`	`96`	`entry.save()`
`97`	`97`
	`98`	`+ifresult["error"]:`
	`99`	`+returndict(error=result["error"])`
	`100`	`+`
`98`	`101`	`ifresult["passed"]:`
`99`	`102`	`self.move_step(1)`
`100`	`103`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ def make_result(`
`42`	`42`	`output=None,`
`43`	`43`	`output_parts=None,`
`44`	`44`	`birdseye_objects=None,`
	`45`	`+error=None,`
`45`	`46`	`):`
`46`	`47`	`ifoutputisNone:`
`47`	`48`	`output=output_buffer.string()`
`@@ -56,21 +57,22 @@ def make_result(`
`56`	`57`	`output=output,`
`57`	`58`	`output_parts=output_parts,`
`58`	`59`	`birdseye_objects=birdseye_objects,`
	`60`	`+error=error,`
`59`	`61`	`)`
`60`	`62`
`61`	`63`
`62`	`64`	`definternal_error_result():`
	`65`	`+tb=traceback.format_exc()`
`63`	`66`	`output=f"""`
`64`	`67`	`INTERNAL ERROR IN COURSE:`
`65`	`68`	`=========================`
`66`	`69`
`67`		`-{"".join(traceback.format_exc())}`
	`70`	`+{tb}`
`68`	`71`
`69`	`72`	`This is an error in our code, not yours.`
`70`		`-Consider using the Feedback button in the top-right menu`
`71`		`-to explain what led up to this.`
`72`	`73`	`"""`
`73`	`74`	`returnmake_result(`
`74`	`75`	`output=output,`
`75`	`76`	`output_parts=[dict(color="red",text=output)],`
	`77`	`+error=dict(traceback=tb),`
`76`	`78`	`)`

Comments

(0)