diff --git a/cron-command.php b/cron-command.php index 770e5db..5fca36f 100644 --- a/cron-command.php +++ b/cron-command.php @@ -5,7 +5,7 @@ } if ( ! defined( 'EE_CRON_SCHEDULER' ) ) { - define( 'EE_CRON_SCHEDULER', 'ee-cron-scheduler' ); + define( 'EE_CRON_SCHEDULER', 'services_global-cron_1' ); } $autoload = dirname( __FILE__ ) . '/vendor/autoload.php'; diff --git a/src/Cron_Command.php b/src/Cron_Command.php index 48bfc4a..c1b8578 100644 --- a/src/Cron_Command.php +++ b/src/Cron_Command.php @@ -68,13 +68,7 @@ class Cron_Command extends EE_Command { */ public function create( $args, $assoc_args ) { - if ( 'running' !== EE_DOCKER::container_status( EE_CRON_SCHEDULER ) ) { - $img_versions = \EE\Utils\get_image_versions(); - $cron_scheduler_run_command = 'docker run --name ' . EE_CRON_SCHEDULER . ' --restart=always -d -v ' . EE_ROOT_DIR . '/services/cron:/etc/ofelia:ro -v /var/run/docker.sock:/var/run/docker.sock:ro easyengine/cron:' . $img_versions['easyengine/cron']; - if ( ! EE_DOCKER::boot_container( EE_CRON_SCHEDULER, $cron_scheduler_run_command ) ) { - EE::error( 'There was some error in starting ' . EE_CRON_SCHEDULER . ' container. Please check logs.' ); - } - } + \EE\Service\Utils\init_global_container( GLOBAL_CRON ); EE\Utils\delem_log( 'ee cron add start' ); diff --git a/src/helper/utils.php b/src/helper/utils.php index adcc3b5..2c196b5 100644 --- a/src/helper/utils.php +++ b/src/helper/utils.php @@ -11,7 +11,7 @@ function update_cron_config() { $config = generate_cron_config(); - file_put_contents( EE_ROOT_DIR . '/services/cron/config.ini', $config ); + file_put_contents( EE_SERVICE_DIR . '/cron/conf/config.ini', $config ); \EE_DOCKER::restart_container( EE_CRON_SCHEDULER ); }