Skip to content

Extend ServerInfo to Support FreeBSD #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kesselb merged 11 commits into from Jun 19, 2020
Merged

Extend ServerInfo to Support FreeBSD #210

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b36d195
Extend ServerInfo to Support FreeBSD
Jun 7, 2020
d1e54a4
Extend ServerInfo to Support FreeBSD
Jun 17, 2020
2d71625
Extend ServerInfo to Support FreeBSD
Jun 17, 2020
a4be63a
Extend ServerInfo to Support FreeBSD
Jun 17, 2020
caec8ea
Merge branch 'master' of https://github.com/constrict/serverinfo
ConstrictM Jun 17, 2020
ee2cfdd
Extend ServerInfo to Support FreeBSD
Jun 17, 2020
b040d29
Extend ServerInfo to Support FreeBSD
ConstrictM Jun 19, 2020
439ea22
Extend ServerInfo to Support FreeBSD
ConstrictM Jun 19, 2020
6a2b468
Extend ServerInfo to Support FreeBSD
ConstrictM Jun 19, 2020
da4e629
Extend ServerInfo to Support FreeBSD
ConstrictM Jun 19, 2020
be74eee
Extend ServerInfo to Support FreeBSD
Jun 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Extend ServerInfo to Support FreeBSD 
Signed-off-by: Matthew Wener <[email protected]>
  • Loading branch information
@ConstrictM
Matthew Wener authored and ConstrictM committed Jun 17, 2020
commit a4be63a25898f644bf91b4cd32161f73f8667fcb
5 changes: 2 additions & 3 deletions lib/OperatingSystems/FreeBSD.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ public function getMemory(): array {

$data['MemTotal'] = (int)$return[0];
$data['MemAvailable'] = (int)$return[1] * ((int)$return[2] + (int)$return[3] + (int)$return[4]);

} catch (\RuntimeException $e) {
return $data;
}
Expand Down Expand Up @@ -101,7 +100,7 @@ public function getTime() {
*
* @return int
*/
public function getUptime(): int {
public function getUptime(): int {
try {
$uptime = $this->executeCommand('/sbin/sysctl -n kern.boottime | tr -d \',\' | cut -d \' \' -f4');
$time = $this->executeCommand('date +%s');
Expand Down Expand Up @@ -234,4 +233,4 @@ protected function executeCommand(string $command): string {
}
return $output;
}
}
}