@@ -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 | |
@@ -29,45 +29,45 @@ |
||
| 29 | 29 | * |
| 30 | 30 | * @return string $index The offset |
| 31 | 31 | */ |
| 32 | - public function offsetGet($index) { |
|
| 32 | + public function offsetGet($index) { |
|
| 33 | 33 | |
| 34 | - return $this->data[$index]; |
|
| 34 | + return $this->data[$index]; |
|
| 35 | 35 | |
| 36 | - } |
|
| 36 | + } |
|
| 37 | 37 | |
| 38 | - /** |
|
| 39 | - * Assigns a value to index offset |
|
| 40 | - * |
|
| 41 | - * @param string $index The offset to assign the value to |
|
| 42 | - * @param mixed $value The value to set |
|
| 43 | - */ |
|
| 44 | - public function offsetSet($index, $value) { |
|
| 38 | + /** |
|
| 39 | + * Assigns a value to index offset |
|
| 40 | + * |
|
| 41 | + * @param string $index The offset to assign the value to |
|
| 42 | + * @param mixed $value The value to set |
|
| 43 | + */ |
|
| 44 | + public function offsetSet($index, $value) { |
|
| 45 | 45 | |
| 46 | - $this->data[$index] = $value; |
|
| 46 | + $this->data[$index] = $value; |
|
| 47 | 47 | |
| 48 | - } |
|
| 48 | + } |
|
| 49 | 49 | |
| 50 | - /** |
|
| 51 | - * Unsets an index |
|
| 52 | - * |
|
| 53 | - * @param string $index The offset to unset |
|
| 54 | - */ |
|
| 55 | - public function offsetUnset($index) { |
|
| 50 | + /** |
|
| 51 | + * Unsets an index |
|
| 52 | + * |
|
| 53 | + * @param string $index The offset to unset |
|
| 54 | + */ |
|
| 55 | + public function offsetUnset($index) { |
|
| 56 | 56 | |
| 57 | - unset($this->data[$index]); |
|
| 57 | + unset($this->data[$index]); |
|
| 58 | 58 | |
| 59 | - } |
|
| 59 | + } |
|
| 60 | 60 | |
| 61 | - /** |
|
| 62 | - * Check if an index exists |
|
| 63 | - * |
|
| 64 | - * @param string $index Offset |
|
| 65 | - * @return boolean |
|
| 66 | - */ |
|
| 67 | - public function offsetExists($index) { |
|
| 61 | + /** |
|
| 62 | + * Check if an index exists |
|
| 63 | + * |
|
| 64 | + * @param string $index Offset |
|
| 65 | + * @return boolean |
|
| 66 | + */ |
|
| 67 | + public function offsetExists($index) { |
|
| 68 | 68 | |
| 69 | - return $this->offsetGet($index) !== null; |
|
| 69 | + return $this->offsetGet($index) !== null; |
|
| 70 | 70 | |
| 71 | - } |
|
| 71 | + } |
|
| 72 | 72 | |
| 73 | 73 | } |
@@ -47,21 +47,21 @@ |
||
| 47 | 47 | ->createQueryBuilder() |
| 48 | 48 | ->insert($this->table) |
| 49 | 49 | ->values(array ( |
| 50 | - 'id' => 0, |
|
| 50 | + 'id' => 0, |
|
| 51 | 51 | 'status' => '?', |
| 52 | 52 | 'pid' => '?', |
| 53 | 53 | 'name' => '?', |
| 54 | 54 | 'jid' => '?', |
| 55 | 55 | 'task' => '?', |
| 56 | - 'parameters' => '?', |
|
| 56 | + 'parameters' => '?', |
|
| 57 | 57 | 'start' => '?' |
| 58 | 58 | )) |
| 59 | 59 | ->setParameter(0, 'RUNNING') |
| 60 | - ->setParameter(1, $pid) |
|
| 60 | + ->setParameter(1, $pid) |
|
| 61 | 61 | ->setParameter(2, $name) |
| 62 | 62 | ->setParameter(3, $jobid) |
| 63 | 63 | ->setParameter(4, $task) |
| 64 | - ->setParameter(5, serialize($parameters)) |
|
| 64 | + ->setParameter(5, serialize($parameters)) |
|
| 65 | 65 | ->setParameter(6, $start) |
| 66 | 66 | ->execute(); |
| 67 | 67 | |