debian-packages/vibe-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #24 from vibe-d/error_handling

Browse source 
Use abort() in case of uncaught Error exceptions.
merged-on-behalf-of: Sönke Ludwig <s-ludwig@users.noreply.github.com>
This commit is contained in:
The Dlang Bot 2017-07-19 10:50:25 +02:00 committed by GitHub
parent 7f050af455 bfc6b89ca4
commit c62f07d257
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/vibe/core/task.d
View file

@ -416,13 +416,13 @@ final package class TaskFiber : Fiber {
logDiagnostic("Full error: %s", th.toString().sanitize()); logDiagnostic("Full error: %s", th.toString().sanitize());
} catch (Throwable th) { } catch (Throwable th) {
import std.stdio : stderr, writeln; import std.stdio : stderr, writeln;
import core.stdc.stdlib : exit; import core.stdc.stdlib : abort;
try stderr.writeln(th); try stderr.writeln(th);
catch (Exception e) { catch (Exception e) {
try stderr.writeln(th.msg); try stderr.writeln(th.msg);
catch (Exception e) {} catch (Exception e) {}
} }
exit(1); abort();
} }
} }

12
source/vibe/core/taskpool.d
View file

@ -237,7 +237,7 @@ private class WorkerThread : Thread {
private void main() private void main()
nothrow { nothrow {
import core.stdc.stdlib : exit; import core.stdc.stdlib : abort;
import core.exception : InvalidMemoryOperationError; import core.exception : InvalidMemoryOperationError;
import std.encoding : sanitize; import std.encoding : sanitize;
@ -249,19 +249,13 @@ private class WorkerThread : Thread {
if (!m_pool.m_state.lock.term) runEventLoop(); if (!m_pool.m_state.lock.term) runEventLoop();
logDebug("Worker thread exit."); logDebug("Worker thread exit.");
} catch (Exception e) { } catch (Exception e) {
scope (failure) exit(-1); scope (failure) abort();
logFatal("Worker thread terminated due to uncaught exception: %s", e.msg); logFatal("Worker thread terminated due to uncaught exception: %s", e.msg);
logDebug("Full error: %s", e.toString().sanitize()); logDebug("Full error: %s", e.toString().sanitize());
} catch (InvalidMemoryOperationError e) {
import std.stdio;
scope(failure) assert(false);
writeln("Error message: ", e.msg);
writeln("Full error: ", e.toString().sanitize());
exit(-1);
} catch (Throwable th) { } catch (Throwable th) {
logFatal("Worker thread terminated due to uncaught error: %s", th.msg); logFatal("Worker thread terminated due to uncaught error: %s", th.msg);
logDebug("Full error: %s", th.toString().sanitize()); logDebug("Full error: %s", th.toString().sanitize());
exit(-1); abort();
} }
} }