Skip to content

Delete container if no crons are available #25

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 4 commits into from
Oct 11, 2018
Merged

Delete container if no crons are available #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a013fb8
Delete container if no crons are in table
sagarnasit Oct 10, 2018
ccc90e7
Update ee-cron-scheduler with constant
sagarnasit Oct 11, 2018
8a0d282
Add check before defining constant
sagarnasit Oct 11, 2018
037a4ad
Fix spacing issue
sagarnasit Oct 11, 2018
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
4 changes: 4 additions & 0 deletions cron-command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
return;
}

if ( ! defined( 'EE_CRON_SCHEDULER' ) ) {
define( 'EE_CRON_SCHEDULER', 'ee-cron-scheduler' );
}

$autoload = dirname( __FILE__ ) . '/vendor/autoload.php';
if ( file_exists( $autoload ) ) {
require_once $autoload;
Expand Down
25 changes: 18 additions & 7 deletions src/Cron_Command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

<?php

use EE\Model\Cron;
Expand All @@ -14,12 +15,7 @@ class Cron_Command extends EE_Command {
* Runs cron container if it's not running
*/
public function __construct() {
if ( 'running' !== EE_DOCKER::container_status( 'ee-cron-scheduler' ) ) {
$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:v' . EE_VERSION;
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.' );
}
}

}

/**
Expand Down Expand Up @@ -80,6 +76,13 @@ public function __construct() {
*/
public function create( $args, $assoc_args ) {

if ( 'running' !== EE_DOCKER::container_status( EE_CRON_SCHEDULER ) ) {
$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:v' . EE_VERSION;
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\Utils\delem_log( 'ee cron add start' );

if ( ! isset( $args[0] ) || 'host' !== $args[0] ) {
Expand Down Expand Up @@ -116,6 +119,7 @@ public function create( $args, $assoc_args ) {

$this->update_cron_config();

EE::success( 'Cron created successfully' );
EE\Utils\delem_log( 'ee cron add end' );
}

Expand Down Expand Up @@ -160,7 +164,7 @@ private function update_cron_config() {

$config = $this->generate_cron_config();
file_put_contents( EE_ROOT_DIR . '/services/cron/config.ini', $config );
EE_DOCKER::restart_container( 'ee-cron-scheduler' );
EE_DOCKER::restart_container( EE_CRON_SCHEDULER );
}

/**
Expand Down Expand Up @@ -294,6 +298,8 @@ public function update( $args, $assoc_args ) {

$this->update_cron_config();

EE::success( 'Cron update Successfully');

EE\Utils\delem_log( 'ee cron add end' );
}

Expand Down Expand Up @@ -402,5 +408,10 @@ public function delete( $args ) {
$this->update_cron_config();

EE::success( 'Deleted cron with id ' . $id );

$cron_entries = Cron::all();
if ( empty( $cron_entries ) ) {
EE::exec( 'docker rm -f ' . EE_CRON_SCHEDULER );
}
}
}