Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
9d5395d
FOUR-20443
pmPaulis Nov 22, 2024
7339f2b
The card needs to hide if the data is null
pmPaulis Nov 22, 2024
81f8e21
Merge remote-tracking branch 'origin/release-2024-fall' into bugfix/F…
pmPaulis Nov 22, 2024
8a902c6
Add method to create Process instance from JSON file
caleeli Nov 22, 2024
389b1c3
Improve modifying exception messages in RunServiceTask
caleeli Nov 22, 2024
8573753
FOUR-20281 : S2: Remove fades
hjonathan Nov 25, 2024
02355d3
Add process name filter
nolanpro Nov 25, 2024
bb05671
FOUR-18935 Ecobank - ERROR 404 ON SECURITY LOGS SWAGGER
julceslauhub Nov 26, 2024
998c1aa
FOUR-20443: solving observations
pmPaulis Nov 26, 2024
0a399a0
Merge pull request #7768 from ProcessMaker/bugfix/FOUR-18935
ryancooley Nov 27, 2024
2e53820
Merge pull request #7765 from ProcessMaker/bugfix/FOUR-20045
ryancooley Nov 27, 2024
10da31a
Merge pull request #7758 from ProcessMaker/bugfix/FOUR-20443
ryancooley Nov 27, 2024
0fe471d
Merge pull request #7761 from ProcessMaker/FOUR-20266
ryancooley Nov 27, 2024
f1ae9af
Version 4.12.0+beta-5
ryancooley Nov 27, 2024
a3161e3
Review all files json
marcoAntonioNina Nov 28, 2024
7e3ecf7
Merge branch 'release-2024-fall' of github.com:ProcessMaker/processma…
marcoAntonioNina Nov 28, 2024
d8c2b99
Added missing translations
danloa Nov 28, 2024
c0b9708
Use new labels for genies assets
danloa Nov 28, 2024
7316382
FOUR-21130
pmPaulis Nov 29, 2024
de600cf
FOUR-21130: solve the unit test
pmPaulis Nov 29, 2024
637aff9
Remove the unnecesary test
pmPaulis Nov 29, 2024
329ed93
FOUR-21104 : Mobile > Tabs do not have the correct style
hjonathan Nov 29, 2024
cdc6a54
Added the collection model to the exporterMap
gustavobascope Nov 29, 2024
6f7a0e9
Removing import change.js from webpack-login.mix.js
CarliPinell Nov 29, 2024
cec2e37
Merge pull request #7776 from ProcessMaker/observation/FOUR-21117
ryancooley Dec 2, 2024
be89b10
Merge pull request #7775 from ProcessMaker/observation/FOUR-21120
ryancooley Dec 2, 2024
da7b313
Merge pull request #7782 from ProcessMaker/bugfix/FOUR-21142
ryancooley Dec 2, 2024
e912b9b
Merge pull request #7781 from ProcessMaker/observation/FOUR-21138
ryancooley Dec 2, 2024
8caef64
Merge pull request #7778 from ProcessMaker/bugfix/FOUR-21130
ryancooley Dec 2, 2024
96b7763
Merge pull request #7780 from ProcessMaker/bugfix/FOUR-21104
ryancooley Dec 2, 2024
78b414e
Update Modeler & Screen Builder
ryancooley Dec 2, 2024
7cef415
Update enterprise packages
ryancooley Dec 2, 2024
63ce99e
Version 4.12.0-RC1
ryancooley Dec 2, 2024
0783b32
Update translations for changed strings
ryancooley Dec 3, 2024
32ea1ff
Merge pull request #7789 from ProcessMaker/translate/changed-strings
ryancooley Dec 3, 2024
2496c6a
Version 4.12.0
ryancooley Dec 3, 2024
7658dea
Merge remote-tracking branch 'origin/release-2024-fall' into feature/…
pmPaulis Dec 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Improve modifying exception messages in RunServiceTask
  • Loading branch information
caleeli committed Nov 22, 2024
commit 389b1c34b384d45459e1dc164cc9b533f00e0462
8 changes: 6 additions & 2 deletions ProcessMaker/Jobs/RunServiceTask.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace ProcessMaker\Jobs;

use Exception;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Support\Facades\Log;
use ProcessMaker\Exception\ConfigurationException;
Expand Down Expand Up @@ -127,8 +128,11 @@ public function action(ProcessRequestToken $token = null, ServiceTaskInterface $
$error->setName($message);

$token->setProperty('error', $error);
$exceptionClass = get_class($exception);
$modifiedException = new $exceptionClass($message);
if ($message !== $exception->getMessage()) {
$modifiedException = new Exception($message, $exception->getCode(), $exception);
} else {
$modifiedException = $exception;
}
$token->logError($modifiedException, $element);

Log::error('Service task failed: ' . $implementation . ' - ' . $message);
Expand Down