diff --git a/ultimate_cron.drush.inc b/ultimate_cron.drush.inc index 365fced..3ca14e8 100644 --- a/ultimate_cron.drush.inc +++ b/ultimate_cron.drush.inc @@ -148,6 +148,7 @@ function drush_ultimate_cron_cron_list() { $table = array(); $table[] = array( '', + dt('ID'), dt('Module'), $title, dt('Scheduled'), @@ -159,7 +160,7 @@ function drush_ultimate_cron_cron_list() { $print_legend = FALSE; /** @var \Drupal\ultimate_cron\Entity\CronJob $job */ - foreach (Cronjob::loadMultiple() as $name => $job) { + foreach (CronJob::loadMultiple() as $name => $job) { if ($modules && !in_array($job->getModule(), $modules)) { continue; } @@ -214,6 +215,7 @@ function drush_ultimate_cron_cron_list() { $progress = $lock_id ? $job->formatProgress() : ''; $table[$name][] = $legend; + $table[$name][] = $job->id(); $table[$name][] = $job->getModuleName(); $table[$name][] = $showname ? $job->id() : $job->getTitle(); $table[$name][] = $job->getPlugin('scheduler')->formatLabel($job); @@ -328,7 +330,7 @@ function drush_ultimate_cron_cron_run($name = NULL) { /** @var CronJob $job */ foreach($jobs as $job) { if ($force || $job->isScheduled()) { - $job->launch(); + $job->run(); } } @@ -362,7 +364,7 @@ function drush_ultimate_cron_cron_enable($name = NULL) { return; } - $job = Cronjob::load($name); + $job = CronJob::load($name); if ($job->enable()->save()) { drush_print(dt('@name enabled', array('@name' => $name))); } @@ -376,7 +378,7 @@ function drush_ultimate_cron_cron_disable($name = NULL) { if (!drush_get_option('all')) { return drush_set_error(dt('No job specified?')); } - foreach (Cronjob::loadMultiple() as $job) { + foreach (CronJob::loadMultiple() as $job) { $job->disable()->save(); } return; @@ -397,7 +399,7 @@ function drush_ultimate_cron_cron_unlock($name = NULL) { return drush_set_error(dt('No job specified?')); } /** @var CronJob $job */ - foreach (Cronjob::loadMultiple() as $job) { + foreach (CronJob::loadMultiple() as $job) { if ($job->isLocked()) { $job->unlock(); } @@ -406,7 +408,7 @@ function drush_ultimate_cron_cron_unlock($name = NULL) { } /** @var CronJob $job */ - $job = Cronjob::load($name); + $job = CronJob::load($name); if (!$job) { return drush_set_error(dt('@name not found', array('@name' => $name))); } @@ -422,8 +424,8 @@ function drush_ultimate_cron_cron_unlock($name = NULL) { global $user; \Drupal::logger('ultimate_cron')->warning('@name manually unlocked by user @username (@uid)', array( '@name' => $job->id(), - '@username' => $user->name, - '@uid' => $user->uid, + '@username' => $user->getDisplayName(), + '@uid' => $user->id(), )); $log_entry->finish();