Normalize memory and disk values to MB #231
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kesselb
force-pushed
the
bug/230/normalize-bytes
branch
from
b37e65e
to
da649ab
Compare
kesselb
commented
Sep 5, 2020
| @@ -195,7 +191,7 @@ public function getDiskInfo(): array { | |||
| $data = []; | |||
|
|
|||
| try { | |||
| $disks = $this->executeCommand('df -TP'); | |||
| $disks = $this->executeCommand('df -TPk'); | |||
There was a problem hiding this comment.
-k = --block-size=1K which is the default on most linux systems.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
kesselb
force-pushed
the
bug/230/normalize-bytes
branch
from
0974082
to
dcdafc1
Compare
kesselb
commented
Sep 5, 2020
| @@ -53,8 +53,8 @@ public function getMemory(): Memory { | |||
|
|
|||
| $result = preg_match_all($pattern, $swapinfo, $matches); | |||
| if ($result === 1) { | |||
| $data->setSwapTotal((int)$matches['Avail'][0]); | |||
| $data->setSwapFree($data->getSwapTotal() - (int)$matches['Used'][0]); | |||
| $data->setSwapTotal((int)($matches['Avail'][0] / 1024)); | |||
There was a problem hiding this comment.
swapinfo -k returns the values as KB. The conversion to bytes was missing here. Now they are correct.
ChristophWurst
approved these changes
Sep 7, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Close #230
Argument 1 passed to OCA\\ServerInfo\\Resources\\Disk::setUsed() must be of the type int, float givenDisk and Memory objects are strictly typed. That's a problem if you are using more than 2147483647 bytes on a 32 bit system. To workaround this issue I changed the units to MB and normalize the values before. As hardening the last call is always
(int).