Skip to content
Merged
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
15 changes: 11 additions & 4 deletions ProcessMaker/Providers/ProcessMakerServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ class ProcessMakerServiceProvider extends ServiceProvider
// Track the landlord values for multitenancy
private static $landlordValues = null;

// Cache tenant app containers to save memory
private static $tenantAppContainers = [];

public function boot(): void
{
// Track the start time for service providers boot
Expand Down Expand Up @@ -261,12 +264,16 @@ private static function bootstrapTenantApp(JobProcessing|JobRetryRequested $even
// Create a new tenant app instance
$_SERVER['TENANT'] = $tenantId;
$_ENV['TENANT'] = $tenantId;
$tenantApp = require app()->bootstrapPath('app.php');
$tenantApp->instance('landlordValues', self::$landlordValues);
$tenantApp->make(\Illuminate\Contracts\Console\Kernel::class)->bootstrap();

if (!isset(self::$tenantAppContainers[$tenantId])) {
$tenantApp = require app()->bootstrapPath('app.php');
$tenantApp->instance('landlordValues', self::$landlordValues);
$tenantApp->make(\Illuminate\Contracts\Console\Kernel::class)->bootstrap();
self::$tenantAppContainers[$tenantId] = $tenantApp;
}

// Change the job's app service container to the tenant app
$event->job->getRedisQueue()->setContainer($tenantApp);
$event->job->getRedisQueue()->setContainer(self::$tenantAppContainers[$tenantId]);
}
}

Expand Down
8 changes: 7 additions & 1 deletion config/horizon.php
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
|
*/

'memory_limit' => 256,
'memory_limit' => env('PM4_HORIZON_WORKER_MEMORY_LIMIT', 512),

/*
|--------------------------------------------------------------------------
Expand All @@ -151,6 +151,7 @@
'sleep' => intval(env('BPMN_QUEUE_INTERVAL', 3000)) * 0.001,
'minProcesses' => env('PM4_HORIZON_SUPERVISOR_BPMN_MIN_PROCESSES', 1),
'maxProcesses' => env('PM4_HORIZON_SUPERVISOR_BPMN_MAX_PROCESSES', 1),
'memory' => env('PM4_HORIZON_WORKER_MEMORY_LIMIT', 512),
],
'supervisor-1' => [
'connection' => 'redis',
Expand All @@ -160,6 +161,7 @@
'timeout' => env('PM4_HORIZON_SUPERVISOR_1_TIMEOUT', 600),
'minProcesses' => env('PM4_HORIZON_SUPERVISOR_1_MIN_PROCESSES', 1),
'maxProcesses' => env('PM4_HORIZON_SUPERVISOR_1_MAX_PROCESSES', 1),
'memory' => env('PM4_HORIZON_WORKER_MEMORY_LIMIT', 512),
],
],

Expand All @@ -173,6 +175,7 @@
'sleep' => intval(env('BPMN_QUEUE_INTERVAL', 3000)) * 0.001,
'minProcesses' => env('PM4_HORIZON_SUPERVISOR_BPMN_MIN_PROCESSES', 1),
'maxProcesses' => env('PM4_HORIZON_SUPERVISOR_BPMN_MAX_PROCESSES', 1),
'memory' => env('PM4_HORIZON_WORKER_MEMORY_LIMIT', 512),
],
'supervisor-1' => [
'connection' => 'redis',
Expand All @@ -182,6 +185,7 @@
'timeout' => env('PM4_HORIZON_SUPERVISOR_1_TIMEOUT', 600),
'minProcesses' => env('PM4_HORIZON_SUPERVISOR_1_MIN_PROCESSES', 1),
'maxProcesses' => env('PM4_HORIZON_SUPERVISOR_1_MAX_PROCESSES', 1),
'memory' => env('PM4_HORIZON_WORKER_MEMORY_LIMIT', 512),
],
],

Expand All @@ -195,6 +199,7 @@
'sleep' => intval(env('BPMN_QUEUE_INTERVAL', 3000)) * 0.001,
'minProcesses' => env('PM4_HORIZON_SUPERVISOR_BPMN_MIN_PROCESSES', 1),
'maxProcesses' => env('PM4_HORIZON_SUPERVISOR_BPMN_MAX_PROCESSES', 1),
'memory' => env('PM4_HORIZON_WORKER_MEMORY_LIMIT', 512),
],
'supervisor-1' => [
'connection' => 'redis',
Expand All @@ -204,6 +209,7 @@
'timeout' => env('PM4_HORIZON_SUPERVISOR_1_TIMEOUT', 600),
'minProcesses' => env('PM4_HORIZON_SUPERVISOR_1_MIN_PROCESSES', 1),
'maxProcesses' => env('PM4_HORIZON_SUPERVISOR_1_MAX_PROCESSES', 1),
'memory' => env('PM4_HORIZON_WORKER_MEMORY_LIMIT', 512),
],
],
],
Expand Down
Loading