@@ -42,6 +42,9 @@ |
||
42 | 42 | 600 => '%M', |
43 | 43 | ); |
44 | 44 | |
45 | + /** |
|
46 | + * @param integer $level |
|
47 | + */ |
|
45 | 48 | public function __construct($level = Logger::DEBUG, $bubble = true) { |
46 | 49 | |
47 | 50 | $this->color = new Console_Color2(); |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | /** |
123 | 123 | * Runner constructor |
124 | 124 | * |
125 | - * @param \Comodojo\Extender\Debug $logger Logger instance |
|
125 | + * @param Logger $logger Logger instance |
|
126 | 126 | * @param bool $multithread Enable/disable multithread mode |
127 | 127 | * @param int $max_result_bytes_in_multithread Max result bytes |
128 | 128 | * @param int $max_childs_runtime Max child runtime |
@@ -676,6 +676,7 @@ discard block |
||
676 | 676 | /** |
677 | 677 | * Change child process priority according to EXTENDER_NICENESS |
678 | 678 | * |
679 | + * @param Logger $logger |
|
679 | 680 | */ |
680 | 681 | private static function adjustNiceness($pid, $logger) { |
681 | 682 |
@@ -74,8 +74,6 @@ discard block |
||
74 | 74 | /** |
75 | 75 | * Class constructor |
76 | 76 | * |
77 | - * @param \Console_CommandLine $parser |
|
78 | - * @param \Monolog\logger $logger |
|
79 | 77 | */ |
80 | 78 | public function add($command, $parameters) { |
81 | 79 | |
@@ -140,11 +138,12 @@ discard block |
||
140 | 138 | /** |
141 | 139 | * Execute command |
142 | 140 | * |
143 | - * @param string $command Command to execute |
|
141 | + * @param string $command_name Command to execute |
|
144 | 142 | * @param array $options Options provided |
145 | 143 | * @param array $args Arguments provided |
146 | 144 | * @param Console_Color2 $color Injected Console_Color2 instance |
147 | - * @param array $tasks Array of available tasks |
|
145 | + * @param TasksTable $tasks Array of available tasks |
|
146 | + * @param Logger $logger |
|
148 | 147 | * |
149 | 148 | * @return string |
150 | 149 | */ |
@@ -200,7 +200,7 @@ |
||
200 | 200 | |
201 | 201 | $commands = Spyc::YAMLLoad(EXTENDER_COMMANDS_CONFIG); |
202 | 202 | |
203 | - foreach ($commands as $command => $parameters) { |
|
203 | + foreach ( $commands as $command => $parameters ) { |
|
204 | 204 | |
205 | 205 | $controller->add($command, $parameters["data"]); |
206 | 206 |
@@ -170,7 +170,7 @@ |
||
170 | 170 | * |
171 | 171 | * @param \Monolog\Logger $logger |
172 | 172 | * |
173 | - * @return array |
|
173 | + * @return TasksTable |
|
174 | 174 | */ |
175 | 175 | public static function load(\Monolog\Logger $logger) { |
176 | 176 |
@@ -180,7 +180,7 @@ |
||
180 | 180 | |
181 | 181 | $tasks = Spyc::YAMLLoad(EXTENDER_TASKS_CONFIG); |
182 | 182 | |
183 | - foreach ($tasks as $task => $parameters) { |
|
183 | + foreach ( $tasks as $task => $parameters ) { |
|
184 | 184 | |
185 | 185 | $description = empty($parameters["data"]["description"]) ? null : $parameters["data"]["description"]; |
186 | 186 |
@@ -305,7 +305,7 @@ |
||
305 | 305 | |
306 | 306 | $events = Spyc::YAMLLoad(EXTENDER_PLUGINS_CONFIG); |
307 | 307 | |
308 | - foreach ($events as $event) { |
|
308 | + foreach ( $events as $event ) { |
|
309 | 309 | |
310 | 310 | $method = empty($event["data"]["method"]) ? null : $event["data"]["method"]; |
311 | 311 |
@@ -653,175 +653,175 @@ |
||
653 | 653 | |
654 | 654 | private function cycle() { |
655 | 655 | |
656 | - // fire extender ready event |
|
656 | + // fire extender ready event |
|
657 | 657 | |
658 | - $this->events->fire("extender", "VOID", $this); |
|
658 | + $this->events->fire("extender", "VOID", $this); |
|
659 | 659 | |
660 | - // dispatch signals (if multithread active) |
|
660 | + // dispatch signals (if multithread active) |
|
661 | 661 | |
662 | - if ( $this->getMultithreadMode() ) pcntl_signal_dispatch(); |
|
662 | + if ( $this->getMultithreadMode() ) pcntl_signal_dispatch(); |
|
663 | 663 | |
664 | - // if extender is paused (SIGINT), skip to extend |
|
664 | + // if extender is paused (SIGINT), skip to extend |
|
665 | 665 | |
666 | - if ( $this->paused ) return; |
|
666 | + if ( $this->paused ) return; |
|
667 | 667 | |
668 | - // fix relative timestamp |
|
668 | + // fix relative timestamp |
|
669 | 669 | |
670 | - $this->timestamp = microtime(true); |
|
670 | + $this->timestamp = microtime(true); |
|
671 | 671 | |
672 | - // fire tasktable event |
|
672 | + // fire tasktable event |
|
673 | 673 | |
674 | - $this->tasks = $this->events->fire("extender.tasks", "TASKSTABLE", $this->tasks); |
|
674 | + $this->tasks = $this->events->fire("extender.tasks", "TASKSTABLE", $this->tasks); |
|
675 | 675 | |
676 | - // get the next planned activity interval |
|
676 | + // get the next planned activity interval |
|
677 | 677 | |
678 | - $plans = Planner::get(); |
|
678 | + $plans = Planner::get(); |
|
679 | 679 | |
680 | - if ( !is_null($plans) AND $this->timestamp < $plans ) { |
|
680 | + if ( !is_null($plans) AND $this->timestamp < $plans ) { |
|
681 | 681 | |
682 | - // nothing to do right now, still waiting if in daemon mode |
|
682 | + // nothing to do right now, still waiting if in daemon mode |
|
683 | 683 | |
684 | - $this->logger->info("Next planned job: ".date('c', $plans)); |
|
684 | + $this->logger->info("Next planned job: ".date('c', $plans)); |
|
685 | 685 | |
686 | - $this->logger->notice("Extender completed\n"); |
|
686 | + $this->logger->notice("Extender completed\n"); |
|
687 | 687 | |
688 | - if ( $this->getDaemonMode() === false ) { |
|
688 | + if ( $this->getDaemonMode() === false ) { |
|
689 | 689 | |
690 | - $this->shutdown(true); |
|
690 | + $this->shutdown(true); |
|
691 | 691 | |
692 | - self::end(0); |
|
692 | + self::end(0); |
|
693 | 693 | |
694 | - } |
|
694 | + } |
|
695 | 695 | |
696 | - return; |
|
696 | + return; |
|
697 | 697 | |
698 | - } |
|
698 | + } |
|
699 | 699 | |
700 | - // if no plan is retrieved, try to retrieve it from scheduler |
|
700 | + // if no plan is retrieved, try to retrieve it from scheduler |
|
701 | 701 | |
702 | - try { |
|
702 | + try { |
|
703 | 703 | |
704 | - // get schedules and dispatch schedule event |
|
704 | + // get schedules and dispatch schedule event |
|
705 | 705 | |
706 | - list($schedules, $planned) = Scheduler::getSchedules($this->logger, $this->timestamp); |
|
706 | + list($schedules, $planned) = Scheduler::getSchedules($this->logger, $this->timestamp); |
|
707 | 707 | |
708 | - // write next planned activity interval |
|
708 | + // write next planned activity interval |
|
709 | 709 | |
710 | - if ( !is_null($planned) AND $planned != 0 ) Planner::set($planned); |
|
710 | + if ( !is_null($planned) AND $planned != 0 ) Planner::set($planned); |
|
711 | 711 | |
712 | - $scheduled = new Schedule(); |
|
712 | + $scheduled = new Schedule(); |
|
713 | 713 | |
714 | - $scheduled->setSchedules($schedules); |
|
714 | + $scheduled->setSchedules($schedules); |
|
715 | 715 | |
716 | - // expose the current shcedule via events |
|
716 | + // expose the current shcedule via events |
|
717 | 717 | |
718 | - $scheduled = $this->events->fire("extender.schedule", "SCHEDULE", $scheduled); |
|
718 | + $scheduled = $this->events->fire("extender.schedule", "SCHEDULE", $scheduled); |
|
719 | 719 | |
720 | - // if no jobs in queue, exit gracefully |
|
720 | + // if no jobs in queue, exit gracefully |
|
721 | 721 | |
722 | - if ( $scheduled->howMany() == 0 ) { |
|
722 | + if ( $scheduled->howMany() == 0 ) { |
|
723 | 723 | |
724 | - $this->logger->info("No jobs to process right now, exiting"); |
|
724 | + $this->logger->info("No jobs to process right now, exiting"); |
|
725 | 725 | |
726 | - $this->logger->notice("Extender completed\n"); |
|
726 | + $this->logger->notice("Extender completed\n"); |
|
727 | 727 | |
728 | - if ( $this->getDaemonMode() === false ) { |
|
728 | + if ( $this->getDaemonMode() === false ) { |
|
729 | 729 | |
730 | - $this->shutdown(true); |
|
730 | + $this->shutdown(true); |
|
731 | 731 | |
732 | - self::end(0); |
|
732 | + self::end(0); |
|
733 | 733 | |
734 | - } |
|
734 | + } |
|
735 | 735 | |
736 | - return; |
|
736 | + return; |
|
737 | 737 | |
738 | - } |
|
738 | + } |
|
739 | 739 | |
740 | - // compose jobs |
|
740 | + // compose jobs |
|
741 | 741 | |
742 | - foreach ( $scheduled->getSchedules() as $schedule ) { |
|
742 | + foreach ( $scheduled->getSchedules() as $schedule ) { |
|
743 | 743 | |
744 | - if ( $this->tasks->isRegistered($schedule['task']) ) { |
|
744 | + if ( $this->tasks->isRegistered($schedule['task']) ) { |
|
745 | 745 | |
746 | - $job = new Job(); |
|
746 | + $job = new Job(); |
|
747 | 747 | |
748 | - $job->setName($schedule['name']) |
|
749 | - ->setId($schedule['id']) |
|
750 | - ->setParameters(unserialize($schedule['params'])) |
|
751 | - ->setTask($schedule['task']) |
|
752 | - ->setClass($this->tasks->getClass($schedule['task'])); |
|
748 | + $job->setName($schedule['name']) |
|
749 | + ->setId($schedule['id']) |
|
750 | + ->setParameters(unserialize($schedule['params'])) |
|
751 | + ->setTask($schedule['task']) |
|
752 | + ->setClass($this->tasks->getClass($schedule['task'])); |
|
753 | 753 | |
754 | - $this->runner->addJob($job); |
|
754 | + $this->runner->addJob($job); |
|
755 | 755 | |
756 | - } else { |
|
756 | + } else { |
|
757 | 757 | |
758 | - $this->logger->warning("Skipping job due to unknown task", array( |
|
759 | - "ID" => $schedule['id'], |
|
760 | - "NAME" => $schedule['name'], |
|
761 | - "TASK" => $schedule['task'] |
|
762 | - )); |
|
758 | + $this->logger->warning("Skipping job due to unknown task", array( |
|
759 | + "ID" => $schedule['id'], |
|
760 | + "NAME" => $schedule['name'], |
|
761 | + "TASK" => $schedule['task'] |
|
762 | + )); |
|
763 | 763 | |
764 | - } |
|
764 | + } |
|
765 | 765 | |
766 | - } |
|
766 | + } |
|
767 | 767 | |
768 | - // lauch runner |
|
768 | + // lauch runner |
|
769 | 769 | |
770 | - $result = $this->runner->run(); |
|
770 | + $result = $this->runner->run(); |
|
771 | 771 | |
772 | - // free runner for next cycle |
|
772 | + // free runner for next cycle |
|
773 | 773 | |
774 | - $this->runner->free(); |
|
774 | + $this->runner->free(); |
|
775 | 775 | |
776 | - // compose results |
|
776 | + // compose results |
|
777 | 777 | |
778 | - $results = new JobsResult($result); |
|
778 | + $results = new JobsResult($result); |
|
779 | 779 | |
780 | - // update schedules |
|
780 | + // update schedules |
|
781 | 781 | |
782 | - Scheduler::updateSchedules($this->logger, $result); |
|
782 | + Scheduler::updateSchedules($this->logger, $result); |
|
783 | 783 | |
784 | - // increment counters |
|
784 | + // increment counters |
|
785 | 785 | |
786 | - foreach ( $result as $r ) { |
|
786 | + foreach ( $result as $r ) { |
|
787 | 787 | |
788 | - if ( $r[2] ) $this->completed_processes++; |
|
788 | + if ( $r[2] ) $this->completed_processes++; |
|
789 | 789 | |
790 | - else $this->failed_processes++; |
|
790 | + else $this->failed_processes++; |
|
791 | 791 | |
792 | - } |
|
792 | + } |
|
793 | 793 | |
794 | - } catch (Exception $e) { |
|
794 | + } catch (Exception $e) { |
|
795 | 795 | |
796 | - $this->logger->error($e->getMessage()); |
|
796 | + $this->logger->error($e->getMessage()); |
|
797 | 797 | |
798 | - if ( $this->getDaemonMode() === false ) { |
|
798 | + if ( $this->getDaemonMode() === false ) { |
|
799 | 799 | |
800 | - self::end(1); |
|
800 | + self::end(1); |
|
801 | 801 | |
802 | - } |
|
802 | + } |
|
803 | 803 | |
804 | - } |
|
804 | + } |
|
805 | 805 | |
806 | - // fire result event |
|
806 | + // fire result event |
|
807 | 807 | |
808 | - $this->events->fire("extender.result", "VOID", $results); |
|
808 | + $this->events->fire("extender.result", "VOID", $results); |
|
809 | 809 | |
810 | - $this->logger->notice("Extender completed\n"); |
|
810 | + $this->logger->notice("Extender completed\n"); |
|
811 | 811 | |
812 | - // show summary (if -s) |
|
812 | + // show summary (if -s) |
|
813 | 813 | |
814 | - if ( $this->summary_mode ) self::showSummary($this->timestamp, $result, $this->color); |
|
814 | + if ( $this->summary_mode ) self::showSummary($this->timestamp, $result, $this->color); |
|
815 | 815 | |
816 | - Status::dump($this->timestamp_absolute, $this->parent_pid, $this->completed_processes, $this->failed_processes, $this->paused); |
|
816 | + Status::dump($this->timestamp_absolute, $this->parent_pid, $this->completed_processes, $this->failed_processes, $this->paused); |
|
817 | 817 | |
818 | - if ( $this->getDaemonMode() === false ) { |
|
818 | + if ( $this->getDaemonMode() === false ) { |
|
819 | 819 | |
820 | - $this->shutdown(true); |
|
820 | + $this->shutdown(true); |
|
821 | 821 | |
822 | - self::end(0); |
|
822 | + self::end(0); |
|
823 | 823 | |
824 | - } |
|
824 | + } |
|
825 | 825 | |
826 | 826 | } |
827 | 827 |
@@ -482,7 +482,7 @@ |
||
482 | 482 | ) |
483 | 483 | )) : 1; |
484 | 484 | |
485 | - while (true) { |
|
485 | + while ( true ) { |
|
486 | 486 | |
487 | 487 | $this->cycle(); |
488 | 488 |
@@ -340,8 +340,7 @@ discard block |
||
340 | 340 | |
341 | 341 | $db->tablePrefix(EXTENDER_DATABASE_PREFIX)->table(EXTENDER_DATABASE_TABLE_JOBS)->keys("lastrun")->values($lastrun)->where('name', '=', $name)->update(); |
342 | 342 | |
343 | - } |
|
344 | - catch (DatabaseException $de) { |
|
343 | + } catch (DatabaseException $de) { |
|
345 | 344 | |
346 | 345 | unset($db); |
347 | 346 | |
@@ -474,8 +473,7 @@ discard block |
||
474 | 473 | |
475 | 474 | if ( $e_count == 5 ) $e_array[] = "*"; |
476 | 475 | |
477 | - } |
|
478 | - catch (Exception $e) { |
|
476 | + } catch (Exception $e) { |
|
479 | 477 | |
480 | 478 | throw $e; |
481 | 479 | |
@@ -516,8 +514,7 @@ discard block |
||
516 | 514 | ->where("enabled", "=", true) |
517 | 515 | ->get(); |
518 | 516 | |
519 | - } |
|
520 | - catch (DatabaseException $de) { |
|
517 | + } catch (DatabaseException $de) { |
|
521 | 518 | |
522 | 519 | unset($db); |
523 | 520 | |
@@ -565,8 +562,7 @@ discard block |
||
565 | 562 | |
566 | 563 | $next_calculated_run = $cron->getNextRunDate($last_date)->format('U'); |
567 | 564 | |
568 | - } |
|
569 | - catch (Exception $e) { |
|
565 | + } catch (Exception $e) { |
|
570 | 566 | |
571 | 567 | $logger->error("Job ".$job['name']." cannot be executed due to cron parsing error", array( |
572 | 568 | "ERROR" => $e->getMessage(), |
@@ -619,8 +615,7 @@ discard block |
||
619 | 615 | |
620 | 616 | $next_calculated_run = $cron->getNextRunDate($last_date)->format('U'); |
621 | 617 | |
622 | - } |
|
623 | - catch (Exception $e) { |
|
618 | + } catch (Exception $e) { |
|
624 | 619 | |
625 | 620 | return false; |
626 | 621 |
@@ -239,8 +239,7 @@ discard block |
||
239 | 239 | |
240 | 240 | $job_run_info = $this->execTask(); |
241 | 241 | |
242 | - } |
|
243 | - catch (Exception $e) { |
|
242 | + } catch (Exception $e) { |
|
244 | 243 | |
245 | 244 | throw new TaskException($e->getMessage(), $e->getCode(), $e, $this->worklog_id); |
246 | 245 | |
@@ -271,8 +270,7 @@ discard block |
||
271 | 270 | |
272 | 271 | $this->closeWorklog(true); |
273 | 272 | |
274 | - } |
|
275 | - catch (Exception $e) { |
|
273 | + } catch (Exception $e) { |
|
276 | 274 | |
277 | 275 | $this->result = $e->getMessage(); |
278 | 276 | |
@@ -316,8 +314,7 @@ discard block |
||
316 | 314 | ->values(array($this->pid, $this->name, $this->jobid, $this->class, 'STARTED', $this->start_timestamp)) |
317 | 315 | ->store(); |
318 | 316 | |
319 | - } |
|
320 | - catch (DatabaseException $de) { |
|
317 | + } catch (DatabaseException $de) { |
|
321 | 318 | |
322 | 319 | throw $de; |
323 | 320 | |
@@ -341,8 +338,7 @@ discard block |
||
341 | 338 | ->where("id", "=", $this->worklog_id) |
342 | 339 | ->update(); |
343 | 340 | |
344 | - } |
|
345 | - catch (DatabaseException $de) { |
|
341 | + } catch (DatabaseException $de) { |
|
346 | 342 | |
347 | 343 | throw $de; |
348 | 344 |