Skip to content

Commit

Permalink
Merge pull request #583 from pimcore/283-switch-to-global-execution-e…
Browse files Browse the repository at this point in the history
…ngine-and-migrate-existing-pimcore-copilot-actions

[Task] Switch to generic execution engine
  • Loading branch information
mcop1 authored Jul 2, 2024
2 parents 26d7ce2 + 5b277ef commit 069512e
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .docker/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Important Notice: this configuration is not optimized for production use!

[program:messenger-consume]
command=php /var/www/html/bin/console messenger:consume pimcore_core pimcore_maintenance pimcore_scheduled_tasks pimcore_image_optimize pimcore_asset_update pimcore_search_backend_message --memory-limit=250M --time-limit=3600
command=php /var/www/html/bin/console messenger:consume pimcore_core pimcore_maintenance pimcore_scheduled_tasks pimcore_image_optimize pimcore_asset_update pimcore_search_backend_message pimcore_generic_execution_engine --memory-limit=250M --time-limit=3600
numprocs=1
startsecs=0
autostart=true
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/pimcore-demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ jobs:
composer create-project \
pimcore/demo:@dev \
--repository='{"type": "path", "url": "./demo"}' \
--no-install \
sample-project
- name: Smoke-test compose file
Expand Down Expand Up @@ -95,7 +96,9 @@ jobs:
if [ ! -z "$PIMCORE_VERSION" ]; then
docker-compose exec -T -- php composer require --no-update pimcore/pimcore:"${PIMCORE_VERSION}"
fi
docker-compose exec -T -- php composer update --no-scripts
# Install dockerize into the php container. We need it to block until
# database is ready to serve connections.
docker-compose exec -T -- php bash -c '\
Expand Down
2 changes: 2 additions & 0 deletions config/bundles.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
use Pimcore\Bundle\ApplicationLoggerBundle\PimcoreApplicationLoggerBundle;
use Pimcore\Bundle\PersonalizationBundle\PimcorePersonalizationBundle;
use Pimcore\Bundle\TinymceBundle\PimcoreTinymceBundle;
use Pimcore\Bundle\GenericExecutionEngineBundle\PimcoreGenericExecutionEngineBundle;

return [
//Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true],
Expand All @@ -45,4 +46,5 @@
PimcoreWordExportBundle::class => ['all' => true],
PimcoreXliffBundle::class => ['all' => true],
PrestaSitemapBundle::class => ['all' => true],
PimcoreGenericExecutionEngineBundle::class => ['all' => true],
];
33 changes: 33 additions & 0 deletions dump/data-0-bootstrap.sql
Original file line number Diff line number Diff line change
Expand Up @@ -3239,3 +3239,36 @@ CREATE TABLE `translations_admin` (
KEY `language` (`language`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;


DROP TABLE IF EXISTS `generic_execution_engine_error_log`;
DROP TABLE IF EXISTS `generic_execution_engine_job_run`;

CREATE TABLE `generic_execution_engine_job_run` (
id int unsigned auto_increment PRIMARY KEY,
ownerId int unsigned NULL,
state varchar(100) NOT NULL,
currentStep int unsigned NULL,
currentMessage text NULL,
log text NULL,
serializedJob longtext NULL,
context longtext NULL,
creationDate int NULL,
modificationDate int NULL,
executionContext varchar(255) default 'default' NULL,
totalElements int unsigned NOT NULL,
processedElementsForStep int unsigned NOT NULL,
CONSTRAINT fk_generic_job_execution_owner_users
FOREIGN KEY (ownerId) REFERENCES pimcore.users (id)
ON DELETE SET NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;

CREATE TABLE `generic_execution_engine_error_log` (
id int unsigned auto_increment PRIMARY KEY,
jobRunId int unsigned NOT NULL,
stepNumber int unsigned NOT NULL,
elementId int unsigned NULL,
errorMessage text NULL,
CONSTRAINT fk_generic_job_execution_log_jobs
FOREIGN KEY (jobRunId) REFERENCES pimcore.generic_execution_engine_job_run (id)
ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
Loading

0 comments on commit 069512e

Please sign in to comment.