Skip to content

Commit e50829b

Browse files
committed
Improve how node warnings are displayed and adjusted type of job terminated events
1 parent a44edda commit e50829b

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

api/v1/cem.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public function post() {
158158
// Create event
159159
$event = new Event(0, "Job terminated", date('Y-m-d H:i:s'),
160160
"The job with the ID " . $job->getId() . " has terminated. The following reason has been provided by the CEM bootstrapper: " . $reason,
161-
Define::EVENT_NODE, $job->getId(), null, $node->getId());
161+
Define::EVENT_JOB, $job->getId(), null, $node->getId());
162162
Factory::getEventFactory()->save($event);
163163
} else if ($job->getStatus() == Define::JOB_STATUS_RUNNING || $job->getStatus() == Define::JOB_STATUS_SCHEDULED
164164
|| $job->getStatus() == Define::JOB_STATUS_SETUP ) {
@@ -167,12 +167,12 @@ public function post() {
167167
// Create event
168168
$event = new Event(0, "Job terminated", date('Y-m-d H:i:s'),
169169
"The job with the ID " . $job->getId() . " has terminated. Job was not reported as finished, thus setting job state to failed.",
170-
Define::EVENT_NODE, $job->getId(), null, $node->getId());
170+
Define::EVENT_JOB, $job->getId(), null, $node->getId());
171171
Factory::getEventFactory()->save($event);
172172
} else {
173173
$event = new Event(0, "Job finished", date('Y-m-d H:i:s'),
174174
"The job with the ID " . $job->getId() . " has has been completed.",
175-
Define::EVENT_NODE, $job->getId(), null, $node->getId());
175+
Define::EVENT_JOB, $job->getId(), null, $node->getId());
176176
Factory::getEventFactory()->save($event);
177177
}
178178
$node->setCurrentJob(null);

views/cem/detail.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<?php } ?>
112112
<div class="info-box-content">
113113
<span class="info-box-text">Health Status</span>
114-
<span class="info-box-number"><?php echo (empty($data['node']->getHealthStatus()) ? "OK" : $data['node']->getHealthStatus()); ?></span>
114+
<span class="info-box-number"><?php echo (empty($data['node']->getHealthStatus()) ? "OK" : nl2br($data['node']->getHealthStatus())); ?></span>
115115
</div>
116116
</div>
117117

views/cem/overview.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ function reloadPage() {
9797
<td><?php echo $n->getId(); ?></td>
9898
<td><?php echo $n->getHostname(); ?></td>
9999
<td><?php if ($n->getCurrentJob() == null) { echo("Idle"); } else { echo "Working on job " . $n->getCurrentJob(); } ?></td>
100-
<td><?php if (!empty($n->getHealthStatus())) { ?> <span class="glyphicon glyphicon-alert" style="color:yellow" title="Warnings detected"></span> <?php } ?></td>
100+
<td><?php if (!empty($n->getHealthStatus())) { ?> <span class="glyphicon glyphicon-alert" style="color:darkorange" title="Warnings detected"></span> <?php } ?></td>
101101
</tr>
102102
<?php } ?>
103103
</tbody>

0 commit comments

Comments
 (0)