Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 11 additions & 2 deletions ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Illuminate\Support\Facades\Auth;
use ProcessMaker\Events\ScriptExecutorUpdated;
use ProcessMaker\Jobs\BuildScriptExecutor;
use ProcessMaker\Jobs\MoveScriptExecutorToMicroservice;
use ProcessMaker\Models\ScriptExecutor;
use ProcessMaker\Models\User;

Expand All @@ -28,7 +29,11 @@ public function import() : bool
case 'copy':
case 'new':
// afterCommit is needed because we are in a db transaction
BuildScriptExecutor::dispatch($this->model->id, $userId)->afterCommit();
if (!config('script-runner-microservice.enabled')) {
BuildScriptExecutor::dispatch($this->model->id, $userId)->afterCommit();
} else {
MoveScriptExecutorToMicroservice::dispatch($this->model->uuid)->afterCommit();
}
break;
case 'update':
if (!empty($this->model->getChanges())) {
Expand All @@ -40,7 +45,11 @@ public function import() : bool
$user = User::where('is_administrator', 1)->first();
}
// afterCommit is needed because we are in a db transaction
BuildScriptExecutor::dispatch($this->model->id, $user->id)->afterCommit();
if (!config('script-runner-microservice.enabled')) {
BuildScriptExecutor::dispatch($this->model->id, $userId)->afterCommit();
} else {
MoveScriptExecutorToMicroservice::dispatch($this->model->uuid)->afterCommit();
}
}
break;

Expand Down
27 changes: 27 additions & 0 deletions ProcessMaker/Jobs/MoveScriptExecutorToMicroservice.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

namespace ProcessMaker\Jobs;

use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Queue\Queueable;

class MoveScriptExecutorToMicroservice implements ShouldQueue
{
use Queueable;

/**
* Create a new job instance.
*/
public function __construct(protected string $uuid)
{
//
}

/**
* Execute the job.
*/
public function handle(): void
{
\Artisan::call('processmaker:transition-executors --uuid=' . $this->uuid );
}
}
Loading