Skip to content

Commit f140c09

Browse files
committed
fix: fix empty error log messages
build: [release]
1 parent 0bd5f18 commit f140c09

1 file changed

Lines changed: 19 additions & 4 deletions

File tree

src/Worker.php

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ protected function _doJob( $job ) {
3535
// Child Process
3636
try {
3737
call_user_func( $job->callbacks['run'], $job->id, $job->data );
38-
} catch ( \Exception $err ) {
39-
et_error( $err->getMessage() );
38+
} catch ( \Throwable $err ) {
39+
et_error( self::_formatThrowable( $err ) );
4040
die( 1 );
4141
}
4242

@@ -50,6 +50,21 @@ protected function _doJob( $job ) {
5050
}
5151
}
5252

53+
protected static function _formatThrowable( \Throwable $err ): string {
54+
$message = trim( $err->getMessage() );
55+
56+
if ( '' === $message ) {
57+
$message = sprintf(
58+
'%s thrown in %s:%d',
59+
get_class( $err ),
60+
$err->getFile(),
61+
$err->getLine()
62+
);
63+
}
64+
65+
return $message;
66+
}
67+
5368
protected function _doJobs(): void {
5469
foreach ( $this->_jobs as $job ) {
5570
$this->_doJob( $job );
@@ -133,12 +148,12 @@ public function run() {
133148
try {
134149
$this->_doJobs();
135150
} catch ( \Throwable $err ) {
136-
et_error( $err->getMessage() );
151+
et_error( self::_formatThrowable( $err ) );
137152
}
138153
}
139154

140155
} catch ( \Throwable $err ) {
141-
$msg = $err->getMessage();
156+
$msg = self::_formatThrowable( $err );
142157

143158
if ( 'Timedout waiting for more work.' !== $msg ) {
144159
et_error( $msg );

0 commit comments

Comments
 (0)