Uh oh!
There was an error while loading. Please reload this page.
Rewrite getMemory / getCPUName / getUptime - #183
Merged
Conversation
kesselbforce-pushed
the
enh/noid/proc-getmemory
branch
2 times, most recently
from
March 15, 2020 20:28
219b417 to
07880ccCompare
Open
I don't know why php does not complain but phpunit were not able to locate the files. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Don't use shell_exec to fetch that information anymore, Make it testable Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
kesselbforce-pushed
the
enh/noid/proc-getmemory
branch
from
March 17, 2020 19:29
1eb6a9b to
89091eeCompareSigned-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
I guess the confusion was the df -TP already returns the values as kB instead of bytes hence we have to multiply the values first before we pass them to FormatBytes. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
kesselbforce-pushed
the
enh/noid/proc-getmemory
branch
from
March 17, 2020 19:33
89091ee to
4a816d1Comparekesselb
marked this pull request as ready for review
April 4, 2020 19:59
# Conflicts: # lib/OperatingSystems/DefaultOs.php # templates/settings-admin.php
rullzer
approved these changes
Apr 14, 2020
This file contains hidden or 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
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
FormatBytesexpected kB instead of byte.