@@ -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 | |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | ) { |
| 28 | 28 | |
| 29 | 29 | // parsing configuration |
| 30 | - $this->configuration = new Configuration( DefaultConfiguration::get() ); |
|
| 30 | + $this->configuration = new Configuration(DefaultConfiguration::get()); |
|
| 31 | 31 | $this->configuration->merge($configuration); |
| 32 | 32 | |
| 33 | 33 | // fix the daemon start time |
@@ -14,24 +14,24 @@ |
||
| 14 | 14 | $chars = 60; |
| 15 | 15 | |
| 16 | 16 | // show the header |
| 17 | - $console->br()->border('-',$chars); |
|
| 17 | + $console->br()->border('-', $chars); |
|
| 18 | 18 | $console->bold()->flank('Extender execution summary'); |
| 19 | - $console->border('-',$chars); |
|
| 19 | + $console->border('-', $chars); |
|
| 20 | 20 | $console->out('Total run time: '.self::calculateRunTime($daemon->starttime)); |
| 21 | - $console->border('-',$chars); |
|
| 21 | + $console->border('-', $chars); |
|
| 22 | 22 | $padding = $console->padding(26); |
| 23 | - $padding->label('Total processed jobs')->result($daemon->completedjobs+$daemon->failedjobs); |
|
| 23 | + $padding->label('Total processed jobs')->result($daemon->completedjobs + $daemon->failedjobs); |
|
| 24 | 24 | $padding = $console->padding(30); |
| 25 | 25 | $padding->label('├─ Completed')->result('<light_green>'.$daemon->completedjobs.'</green>'); |
| 26 | 26 | $padding->label('└─ Failed')->result('<red>'.$daemon->failedjobs.'</red>'); |
| 27 | - $console->border('-',$chars); |
|
| 27 | + $console->border('-', $chars); |
|
| 28 | 28 | |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | private static function calculateRunTime($starttime) { |
| 32 | 32 | |
| 33 | - $start_formatted = sprintf("%06d",($starttime - floor($starttime)) * 1000000); |
|
| 34 | - $start = new DateTime( date('Y-m-d H:i:s.'.$start_formatted, $starttime) ); |
|
| 33 | + $start_formatted = sprintf("%06d", ($starttime - floor($starttime)) * 1000000); |
|
| 34 | + $start = new DateTime(date('Y-m-d H:i:s.'.$start_formatted, $starttime)); |
|
| 35 | 35 | $end = new DateTime(); |
| 36 | 36 | |
| 37 | 37 | $diff = $end->diff($start); |
@@ -9,7 +9,7 @@ |
||
| 9 | 9 | |
| 10 | 10 | $daemon = $event->getDaemon(); |
| 11 | 11 | |
| 12 | - if ( $daemon->looplimit === $daemon->loopcount) { |
|
| 12 | + if ( $daemon->looplimit === $daemon->loopcount ) { |
|
| 13 | 13 | $daemon->logger->info('Stopping daemon due to loop limit ('.$daemon->looplimit.') reached'); |
| 14 | 14 | // $daemon->stop(); |
| 15 | 15 | $daemon->loopactive = false; |
@@ -14,10 +14,10 @@ |
||
| 14 | 14 | |
| 15 | 15 | if ( empty($jobs) ) return; |
| 16 | 16 | |
| 17 | - $console->border('-',30); |
|
| 17 | + $console->border('-', 30); |
|
| 18 | 18 | $console->bold()->green('Extender loop summary'); |
| 19 | 19 | $console->out("Loop duration: ".round($daemon->loopelapsed)); |
| 20 | - $console->border('-',30); |
|
| 20 | + $console->border('-', 30); |
|
| 21 | 21 | $console->out("Executed jobs: "); |
| 22 | 22 | $console->table($jobs); |
| 23 | 23 | |
@@ -55,8 +55,7 @@ |
||
| 55 | 55 | |
| 56 | 56 | if ( $e_count == 5 ) $e_array[] = "*"; |
| 57 | 57 | |
| 58 | - } |
|
| 59 | - catch (Exception $e) { |
|
| 58 | + } catch (Exception $e) { |
|
| 60 | 59 | |
| 61 | 60 | throw $e; |
| 62 | 61 | |
@@ -28,6 +28,9 @@ |
||
| 28 | 28 | |
| 29 | 29 | private $task; |
| 30 | 30 | |
| 31 | + /** |
|
| 32 | + * @param string $status |
|
| 33 | + */ |
|
| 31 | 34 | public function __construct($status, TaskInterface $task) { |
| 32 | 35 | |
| 33 | 36 | $name = $task->getName(); |
@@ -67,8 +67,7 @@ discard block |
||
| 67 | 67 | /** |
| 68 | 68 | * Get niceness of a running process |
| 69 | 69 | * |
| 70 | - * @param int|null $pid The pid to query, or current process if null |
|
| 71 | - * @return int |
|
| 70 | + * @return string |
|
| 72 | 71 | */ |
| 73 | 72 | public function getName() { |
| 74 | 73 | |
@@ -79,8 +78,7 @@ discard block |
||
| 79 | 78 | /** |
| 80 | 79 | * Get niceness of a running process |
| 81 | 80 | * |
| 82 | - * @param int|null $pid The pid to query, or current process if null |
|
| 83 | - * @return int |
|
| 81 | + * @return TaskParameters |
|
| 84 | 82 | */ |
| 85 | 83 | public function getParameters() { |
| 86 | 84 | |
@@ -91,8 +89,8 @@ discard block |
||
| 91 | 89 | /** |
| 92 | 90 | * Get niceness of a running process |
| 93 | 91 | * |
| 94 | - * @param int|null $pid The pid to query, or current process if null |
|
| 95 | - * @return int |
|
| 92 | + * @param string $name |
|
| 93 | + * @return AbstractTask |
|
| 96 | 94 | */ |
| 97 | 95 | public function setName($name) { |
| 98 | 96 | |
@@ -105,8 +103,7 @@ discard block |
||
| 105 | 103 | /** |
| 106 | 104 | * Get niceness of a running process |
| 107 | 105 | * |
| 108 | - * @param int|null $pid The pid to query, or current process if null |
|
| 109 | - * @return int |
|
| 106 | + * @return AbstractTask |
|
| 110 | 107 | */ |
| 111 | 108 | public function setParameters(TaskParameters $parameters) { |
| 112 | 109 | |
@@ -137,7 +137,7 @@ |
||
| 137 | 137 | |
| 138 | 138 | $result = []; |
| 139 | 139 | |
| 140 | - foreach($tasks as $task) { |
|
| 140 | + foreach ( $tasks as $task ) { |
|
| 141 | 141 | |
| 142 | 142 | if ( empty($task['name']) || empty($task['class']) ) { |
| 143 | 143 | |