[Bootstrap] Integrate ErrorHandler
This commit is contained in:
		
							parent
							
								
									e7d1a6dfac
								
							
						
					
					
						commit
						af9cf611cb
					
				
					 2 changed files with 11 additions and 29 deletions
				
			
		
							
								
								
									
										15
									
								
								src/bootstrap.js
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										15
									
								
								src/bootstrap.js
									
										
									
									
										vendored
									
									
								
							|  | @ -1,4 +1,4 @@ | |||
| const { app } = require('electron'); | ||||
| const { app, dialog } = require('electron'); | ||||
| const { readFileSync } = require('fs'); | ||||
| const { join } = require('path'); | ||||
| 
 | ||||
|  | @ -14,8 +14,15 @@ global.releaseChannel = buildInfo.releaseChannel; | |||
| 
 | ||||
| log('BuildInfo', buildInfo); | ||||
| 
 | ||||
| const { fatal, handled, init: EHInit } = require('./errorHandler'); | ||||
| EHInit(); | ||||
| const fatal = e => { | ||||
|   log('Fatal', e); | ||||
| 
 | ||||
|   dialog.showMessageBox({ | ||||
|     type: 'error', | ||||
|     message: 'A fatal Javascript error occured', | ||||
|     detail: e?.stack ?? String(e) | ||||
|   }).then(() => app.quit()); | ||||
| }; | ||||
| 
 | ||||
| const splash = require('./splash'); | ||||
| 
 | ||||
|  | @ -69,7 +76,7 @@ const startUpdate = async () => { | |||
|     inst.on('host-updated', () => autoStart.update(() => {})); | ||||
|     inst.on('unhandled-exception', fatal); | ||||
|     inst.on('InconsistentInstallerState', fatal); | ||||
|     inst.on('update-error', handled); | ||||
|     inst.on('update-error', console.error); | ||||
| 
 | ||||
|     require('./firstRun').do(inst); | ||||
|   } else { | ||||
|  |  | |||
|  | @ -1,25 +0,0 @@ | |||
| const { app, dialog } = require("electron"); | ||||
| 
 | ||||
| exports.init = () => { | ||||
|   process.on('uncaughtException', err => { | ||||
|     const stack = err.stack ?? String(err); | ||||
|     console.warn(stack); | ||||
| 
 | ||||
|     // dialog.showErrorBox('A JavaScript error occurred in the main process', message);
 | ||||
|   }); | ||||
| }; | ||||
| 
 | ||||
| 
 | ||||
| exports.fatal = (err) => { | ||||
|   log('ErrorHandler', 'Fatal:', err); | ||||
| 
 | ||||
|   dialog.showMessageBox(null, { | ||||
|     type: 'error', | ||||
|     message: 'A fatal Javascript error occured', | ||||
|     detail: err?.stack ?? String(err) | ||||
|   }).then(() => app.quit()); | ||||
| }; | ||||
| 
 | ||||
| exports.handled = (err) => { | ||||
|   log('ErrorHandler', 'Handled:', err); | ||||
| }; | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue