Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
945d04aa
J
jenkins
项目概览
FIY695
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
945d04aa
编写于
1月 19, 2011
作者:
J
Jesse Farinacci
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixes HUDSON-8546, active jobs on temporarily offline slaves
上级
fcd05591
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
64 addition
and
61 deletion
+64
-61
changelog.html
changelog.html
+3
-0
core/src/main/resources/lib/hudson/executors.jelly
core/src/main/resources/lib/hudson/executors.jelly
+61
-61
未找到文件。
changelog.html
浏览文件 @
945d04aa
...
...
@@ -51,6 +51,9 @@ Upcoming changes</a>
<li
class=
bug
>
Node names can be edited to include slashes and then cannot be removed.
(
<a
href=
"http://issues.hudson-ci.org/browse/HUDSON-8438"
>
issue 8437
</a>
)
<li
class=
bug
>
Fix temporarily offline slaves not showing active jobs
(
<a
href=
"http://issues.hudson-ci.org/browse/HUDSON-8546"
>
issue 8546
</a>
)
<li
class=
rfe
>
Startup performance improvement
<li
class=
rfe
>
...
...
core/src/main/resources/lib/hudson/executors.jelly
浏览文件 @
945d04aa
...
...
@@ -38,63 +38,67 @@ THE SOFTWARE.
<j:if test="${!c.acceptingTasks}"> <st:nbsp/> (${%suspended})</j:if>
</d:tag>
<d:tag name="executor">
<tr>
<td class="pane" align="right" style="vertical-align: top">
${name}
</td>
<j:choose>
<j:when test="${!e.alive}">
<td class="pane">
<a href="${rootURL}/${c.url}${url}/causeOfDeath">
<div class="error">${%Dead} (!)</div>
</a>
<j:choose>
<j:when test="${!c.offline or (c.offline and !e.idle)}">
<tr>
<td class="pane" align="right" style="vertical-align: top">
${name}
</td>
<td class="pane"/>
</j:when>
<j:when test="${e.idle}">
<td class="pane">
<j:choose>
<j:when test="${c.offline}">
<a href="${rootURL}/${c.url}">${%Offline}</a>
</j:when>
<j:otherwise>
${%Idle}
</j:otherwise>
</j:choose>
</td>
<td class="pane"/>
</j:when>
<j:otherwise>
<!-- not actually optional, but it helps with backward compatibility -->
<j:set var="executor" value="${e}" />
<st:include it="${e.currentExecutable}" page="executorCell.jelly" optional="true">
<td class="pane">
<div style="white-space: normal">${%Building}
<j:set var="exe" value="${e.currentExecutable}" />
<j:invokeStatic var="exeparent"
className="hudson.model.queue.Executables" method="getParentOf">
<j:arg type="hudson.model.Queue$Executable" value="${exe}" />
</j:invokeStatic>
<j:choose>
<j:when test="${!e.alive}">
<td class="pane">
<a href="${rootURL}/${c.url}${url}/causeOfDeath">
<div class="error">${%Dead} (!)</div>
</a>
</td>
<td class="pane"/>
</j:when>
<j:when test="${e.idle}">
<td class="pane">
<j:choose>
<j:when test="${h.hasPermission(exeparent,exeparent.READ)}">
<a href="${rootURL}/${exeparent.url}">${exeparent.fullDisplayName}</a> <a href="${rootURL}/${exe.url}">#${exe.number}</a>
<t:buildProgressBar build="${exe}" executor="${executor}"/>
<j:when test="${c.offline}">
<a href="${rootURL}/${c.url}">${%Offline}</a>
</j:when>
<j:otherwise>
<span>${%Unknown Task}</span>
${%Idle}
</j:otherwise>
</j:choose>
</div>
</td>
</st:include>
<td class="pane" align="center" valign="middle">
<j:if test="${e.hasStopPermission()}">
<a href="${rootURL}/${c.url}${url}/stop"><img src="${imagesURL}/16x16/stop.gif" alt="${%terminate this build}" /></a>
</j:if>
</td>
</j:otherwise>
</j:choose>
</tr>
</td>
<td class="pane"/>
</j:when>
<j:otherwise>
<!-- not actually optional, but it helps with backward compatibility -->
<j:set var="executor" value="${e}" />
<st:include it="${e.currentExecutable}" page="executorCell.jelly" optional="true">
<td class="pane">
<div style="white-space: normal">${%Building}
<j:set var="exe" value="${e.currentExecutable}" />
<j:invokeStatic var="exeparent"
className="hudson.model.queue.Executables" method="getParentOf">
<j:arg type="hudson.model.Queue$Executable" value="${exe}" />
</j:invokeStatic>
<j:choose>
<j:when test="${h.hasPermission(exeparent,exeparent.READ)}">
<a href="${rootURL}/${exeparent.url}">${exeparent.fullDisplayName}</a> <a href="${rootURL}/${exe.url}">#${exe.number}</a>
<t:buildProgressBar build="${exe}" executor="${executor}"/>
</j:when>
<j:otherwise>
<span>${%Unknown Task}</span>
</j:otherwise>
</j:choose>
</div>
</td>
</st:include>
<td class="pane" align="center" valign="middle">
<j:if test="${e.hasStopPermission()}">
<a href="${rootURL}/${c.url}${url}/stop"><img src="${imagesURL}/16x16/stop.gif" alt="${%terminate this build}" /></a>
</j:if>
</td>
</j:otherwise>
</j:choose>
</tr>
</j:when>
</j:choose>
</d:tag>
</d:taglib>
<j:set var="computers" value="${attrs.computers?:app.computers}" />
...
...
@@ -126,16 +130,12 @@ THE SOFTWARE.
</j:otherwise>
</j:choose>
</tr>
<j:choose>
<j:when test="${!c.offline}">
<j:forEach var="e" items="${c.executors}" varStatus="eloop">
<local:executor name="${eloop.index+1}" url="executors/${eloop.index}" />
</j:forEach>
<j:forEach var="e" items="${c.oneOffExecutors}" varStatus="eloop">
<local:executor name="" url="oneOffExecutors/${eloop.index}" />
</j:forEach>
</j:when>
</j:choose>
<j:forEach var="e" items="${c.executors}" varStatus="eloop">
<local:executor name="${eloop.index+1}" url="executors/${eloop.index}" />
</j:forEach>
<j:forEach var="e" items="${c.oneOffExecutors}" varStatus="eloop">
<local:executor name="" url="oneOffExecutors/${eloop.index}" />
</j:forEach>
</j:forEach>
</l:pane>
<!-- schedule updates only for the full page reload -->
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录