Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/cron-job-fix' into feature/upgrade-laravel-to-5.6

Browse source
This commit is contained in:
Lance Pioch 2018-05-13 11:59:51 -04:00
commit 9cbada17b2
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Services/Schedules/ProcessScheduleService.php
View file

@ -63,7 +63,7 @@ class ProcessScheduleService
{ {
$this->repository->loadTasks($schedule); $this->repository->loadTasks($schedule);
$formattedCron = sprintf('%s %s %s * %s *', $formattedCron = sprintf('%s %s %s * %s',
$schedule->cron_minute, $schedule->cron_minute,
$schedule->cron_hour, $schedule->cron_hour,
$schedule->cron_day_of_month, $schedule->cron_day_of_month,

2
app/Services/Schedules/ScheduleCreationService.php
View file

@ -86,7 +86,7 @@ class ScheduleCreationService
*/ */
private function getCronTimestamp(array $data) private function getCronTimestamp(array $data)
{ {
$formattedCron = sprintf('%s %s %s * %s *', $formattedCron = sprintf('%s %s %s * %s',
array_get($data, 'cron_minute', '*'), array_get($data, 'cron_minute', '*'),
array_get($data, 'cron_hour', '*'), array_get($data, 'cron_hour', '*'),
array_get($data, 'cron_day_of_month', '*'), array_get($data, 'cron_day_of_month', '*'),

2
app/Services/Schedules/ScheduleUpdateService.php
View file

@ -98,7 +98,7 @@ class ScheduleUpdateService
*/ */
private function getCronTimestamp(array $data) private function getCronTimestamp(array $data)
{ {
$formattedCron = sprintf('%s %s %s * %s *', $formattedCron = sprintf('%s %s %s * %s',
array_get($data, 'cron_minute', '*'), array_get($data, 'cron_minute', '*'),
array_get($data, 'cron_hour', '*'), array_get($data, 'cron_hour', '*'),
array_get($data, 'cron_day_of_month', '*'), array_get($data, 'cron_day_of_month', '*'),

2
tests/Unit/Services/Schedules/ProcessScheduleServiceTest.php
View file

@ -60,7 +60,7 @@ class ProcessScheduleServiceTest extends TestCase
$this->repository->shouldReceive('loadTasks')->with($model)->once()->andReturn($model); $this->repository->shouldReceive('loadTasks')->with($model)->once()->andReturn($model);
$formatted = sprintf('%s %s %s * %s *', $model->cron_minute, $model->cron_hour, $model->cron_day_of_month, $model->cron_day_of_week); $formatted = sprintf('%s %s %s * %s', $model->cron_minute, $model->cron_hour, $model->cron_day_of_month, $model->cron_day_of_week);
$this->repository->shouldReceive('update')->with($model->id, [ $this->repository->shouldReceive('update')->with($model->id, [
'is_processing' => true, 'is_processing' => true,
'next_run_at' => CronExpression::factory($formatted)->getNextRunDate(), 'next_run_at' => CronExpression::factory($formatted)->getNextRunDate(),

4
tests/Unit/Services/Schedules/ScheduleCreationServiceTest.php
View file

@ -64,7 +64,7 @@ class ScheduleCreationServiceTest extends TestCase
$this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull(); $this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
$this->repository->shouldReceive('create')->with([ $this->repository->shouldReceive('create')->with([
'server_id' => $server->id, 'server_id' => $server->id,
'next_run_at' => CronExpression::factory('* * * * * *')->getNextRunDate(), 'next_run_at' => CronExpression::factory('* * * * *')->getNextRunDate(),
'test_key' => 'value', 'test_key' => 'value',
])->once()->andReturn($schedule); ])->once()->andReturn($schedule);
$this->connection->shouldReceive('commit')->withNoArgs()->once()->andReturnNull(); $this->connection->shouldReceive('commit')->withNoArgs()->once()->andReturnNull();
@ -85,7 +85,7 @@ class ScheduleCreationServiceTest extends TestCase
$this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull(); $this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
$this->repository->shouldReceive('create')->with([ $this->repository->shouldReceive('create')->with([
'server_id' => $server->id, 'server_id' => $server->id,
'next_run_at' => CronExpression::factory('* * * * * *')->getNextRunDate(), 'next_run_at' => CronExpression::factory('* * * * *')->getNextRunDate(),
'test_key' => 'value', 'test_key' => 'value',
])->once()->andReturn($schedule); ])->once()->andReturn($schedule);

2
tests/Unit/Services/Schedules/ScheduleUpdateServiceTest.php
View file

@ -64,7 +64,7 @@ class ScheduleUpdateServiceTest extends TestCase
$this->connection->shouldReceive('beginTransaction')->once()->withNoArgs(); $this->connection->shouldReceive('beginTransaction')->once()->withNoArgs();
$this->repository->shouldReceive('update')->once()->with($schedule->id, array_merge($data, [ $this->repository->shouldReceive('update')->once()->with($schedule->id, array_merge($data, [
'next_run_at' => CronExpression::factory('1 2 3 * 4 *')->getNextRunDate(), 'next_run_at' => CronExpression::factory('1 2 3 * 4')->getNextRunDate(),
]))->andReturn($schedule); ]))->andReturn($schedule);
$this->taskRepository->shouldReceive('deleteWhere')->once()->with([['schedule_id', '=', $schedule->id]]); $this->taskRepository->shouldReceive('deleteWhere')->once()->with([['schedule_id', '=', $schedule->id]]);