Skip to content

FOUR-15873 Enhance Script Watcher Endpoint Performance #6947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 13, 2024
Merged

FOUR-15873 Enhance Script Watcher Endpoint Performance #6947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ProcessMaker/Console/Commands/BuildScriptExecutors.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public function buildExecutor()

$this->execCommand($command);

$isNayra = $scriptExecutor->language === 'nayra';
$isNayra = $scriptExecutor->language === 'php-nayra';
if ($isNayra) {
$instanceName = config('app.instance');
$this->info('Stop existing nayra container');
Expand Down
18 changes: 12 additions & 6 deletions ProcessMaker/ScriptRunners/Base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,10 @@ public function __construct(ScriptExecutor $scriptExecutor)
*/
public function run($code, array $data, array $config, $timeout, ?User $user)
{
$isNayra = $this->scriptExecutor->language === self::NAYRA_LANG;

// Prepare the docker parameters
$environmentVariables = $this->getEnvironmentVariables();
$environmentVariables = $this->getEnvironmentVariables(!$isNayra);
if (!getenv('HOME')) {
putenv('HOME=' . base_path());
}
Expand All @@ -82,14 +84,13 @@ public function run($code, array $data, array $config, $timeout, ?User $user)
$token = new GenerateAccessToken($user);
return $token->getToken();
});
$environmentVariables[] = 'API_TOKEN=' . $accessToken;
$environmentVariables[] = 'API_TOKEN=' . (!$isNayra ? escapeshellarg($accessToken) : $accessToken);
$environmentVariables[] = 'API_HOST=' . config('app.docker_host_url') . '/api/1.0';
$environmentVariables[] = 'APP_URL=' . config('app.docker_host_url');
$environmentVariables[] = 'API_SSL_VERIFY=' . (config('app.api_ssl_verify') ? '1' : '0');
}

// Nayra Executor
$isNayra = $this->scriptExecutor->language === self::NAYRA_LANG;
if ($isNayra) {
$response = $this->handleNayraDocker($code, $data, $config, $timeout, $environmentVariables);
return json_decode($response, true);
Expand Down Expand Up @@ -164,14 +165,19 @@ public function run($code, array $data, array $config, $timeout, ?User $user)
/**
* Get the environment variables.
*
* @param bool $useEscape
* @return array
*/
private function getEnvironmentVariables()
private function getEnvironmentVariables($useEscape = true)
{
$variablesParameter = [];
EnvironmentVariable::chunk(50, function ($variables) use (&$variablesParameter) {
EnvironmentVariable::chunk(50, function ($variables) use (&$variablesParameter, $useEscape) {
foreach ($variables as $variable) {
$variablesParameter[] = escapeshellarg($variable['name']) . '=' . escapeshellarg($variable['value']);
if ($useEscape) {
$variablesParameter[] = escapeshellarg($variable['name']) . '=' . escapeshellarg($variable['value']);
} else {
$variablesParameter[] = $variable['name'] . '=' . $variable['value'];
}
}
});

Expand Down
Loading