diff options
Diffstat (limited to 'shared/classes/task.php')
| -rw-r--r-- | shared/classes/task.php | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/shared/classes/task.php b/shared/classes/task.php index d763107..e249e0f 100644 --- a/shared/classes/task.php +++ b/shared/classes/task.php @@ -51,30 +51,25 @@ class sql_task extends sql_row_obj { global $S; $link="build/$this->build/$this->order"; $html='<div class="task"><div class="description">'.htmlentities($this->description).'</div><div class="info">'.($S['request'] == $link || strpos($S['request'], "$link/") === 0?'':'[<a href="'.url($link).'">log</a>] ').($this->command?'<span class="command"'.($this->env?' title="'.htmlentities(str_replace("\n", '; ', $this->env)).'"':'').'>'.htmlentities($this->command).'</span> ':''); - if (isset($this->start)) { - if (isset($this->finish)) { - $html.='<span class="status '; - if ($this->exit === '0') { - $html.='successful">[successful'; - } else { - $html.='failed">['; - if (isset($this->exit)) { - if ($this->exit > 0) - $html.='exit status '.$this->exit; - elseif ($this->exit == -128) - $html.='got unknown signal'; - else - $html.='got signal '.-$this->exit; - } else - $html.='failed to execute'; - } - $html.=']</span> <span class="time">Finished in <span class="time">'.display_time($this->finish-$this->start).'</span></span>'; + if (isset($this->finish)) { + $html.='<span class="status '; + if ($this->exit === '0') { + $html.='successful">[successful'; } else { - $html.='<span class="status running">[running]</span> <span class="time">Running for <span class="time">'.display_time(time()-$this->start).'</span></span>'; + $html.='failed">['; + if (isset($this->exit)) { + if ($this->exit > 0) + $html.='exit status '.$this->exit; + elseif ($this->exit == -128) + $html.='got unknown signal'; + else + $html.='got signal '.-$this->exit; + } else + $html.='failed to execute'; } + $html.=']</span> <span class="time">Finished in <span class="time">'.display_time($this->finish-$this->start).'</span></span>'; } else { - $num=query('SELECT COUNT(*) FROM `tasks` WHERE `builds`="'.$this->build.'" AND `start` IS NULL AND `order` <= '.$this->order)->fetch(PDO::FETCH_ASSOC); - $html.="<span class=\"status queued\">[queued $num/".$build->queued_tasks()."]</span>"; + $html.='<span class="status running">[running]</span> <span class="time">Running for <span class="time">'.display_time(time()-$this->start).'</span></span>'; } $html.='</div></div>'; return $html; |