Skip to content
Snippets Groups Projects
Commit 58fe4eba authored by Tibo's avatar Tibo
Browse files

refactor ClientVersion sensor

parent 82deb479
No related branches found
No related tags found
No related merge requests found
......@@ -48,10 +48,20 @@ class ClientVersion extends \App\AbstractSensor
public function report(array $records) : string
{
return "<p>Installed version: " . $this->getServer()->clientVersion() . "</p>"
return "<p>Installed version: " . $this->installedVersion($records) . "</p>"
. "<p>Latest client version: " . $this->latestVersion() . "</p>";
}
public function installedVersion(array $records)
{
$last_record = end($records);
if ($last_record == null) {
return "none";
}
return $last_record->version;
}
public function status(array $records) : int
{
$latest_version = "unknown";
......@@ -62,7 +72,7 @@ class ClientVersion extends \App\AbstractSensor
return self::STATUS_UNKNOWN;
}
if ($this->getServer()->clientVersion() === $latest_version) {
if ($this->installedVersion($records) === $latest_version) {
return self::STATUS_OK;
}
......
......@@ -14,7 +14,7 @@ class LoadAvg extends AbstractSensor
public function report(array $records) : string
{
$record = $this->getServer()->lastRecord();
$record = end($records);
if (! isset($record['loadavg'])) {
return "<p>No data available...</p>";
}
......
......@@ -96,14 +96,10 @@ class Server extends Model
return $hearbeat->lastRecordTime($this->lastRecord());
}
public function clientVersion()
public function clientVersion(array $records) : string
{
$last_record = $this->lastRecord();
if ($last_record == null) {
return "none";
}
return $last_record->version;
$sensor = new \App\Sensor\ClientVersion($this);
return $sensor->installedVersion($records);
}
public function lastClientUrl()
......
......@@ -34,7 +34,7 @@ window.monitorServerToken = "{{ $server->read_token }}";
({{ $server->lastRecordTime()->diffForHumans() }})
</p>
<p>Client version: {{ $server->clientVersion() }}</p>
<p>Client version: {{ $server->clientVersion($records) }}</p>
<p>Uptime: {{ $server->uptime() }}</p>
</div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment