Skip to content
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

Jump to bottom

Rewrite getMemory / getCPUName / getUptime #183

Merged
merged 8 commits into from
Apr 14, 2020
Merged

Rewrite getMemory / getCPUName / getUptime #183

merged 8 commits into from
Apr 14, 2020

Conversation

kesselb
Copy link
Collaborator

@kesselb kesselb commented Mar 15, 2020 •
edited
Loading

  • Fix wrong namespace
  • Use file_get_contents instead of shell_exec for uptime, hostname, cpu name, memory info
  • FormatBytes expected kB instead of byte.
  • Make parsing testable

@kesselb kesselb added this to the Nextcloud 19 milestone Mar 15, 2020
@kesselb kesselb force-pushed the enh/noid/proc-getmemory branch 2 times, most recently from 219b417 to 07880cc Compare March 15, 2020 20:28
@kesselb kesselb mentioned this pull request Mar 16, 2020
Open
@kesselb kesselb changed the title Rewrite getMemory Rewrite getMemory / getCPUName / getUptime Mar 16, 2020
kesselb added 3 commits March 17, 2020 20:28
@kesselb
Namespace for the app is ServerInfo as per info.xml
b2ed6c5 
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>
@kesselb
Rewrite getMemory to return a array of information
04870e1 
Don't use shell_exec to fetch that information anymore, Make it testable

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb
Read cpu name from proc without shell_exec
d337916 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb kesselb force-pushed the enh/noid/proc-getmemory branch from 1eb6a9b to 89091ee Compare March 17, 2020 19:29
kesselb added 4 commits March 17, 2020 20:33
@kesselb
Use /proc/uptime to read the uptime
c4e0790 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb
Use gethostname to fetch the systems hostname
275b70b 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb
Return something for getOsName
0e77103 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb
Fix FormatBytes expects kB instead of bytes
4a816d1 
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>
@kesselb kesselb force-pushed the enh/noid/proc-getmemory branch from 89091ee to 4a816d1 Compare March 17, 2020 19:33
@HigH-HawK HigH-HawK mentioned this pull request Mar 18, 2020
Closed
@rullzer rullzer mentioned this pull request Apr 4, 2020
Merged
80 tasks
@kesselb kesselb marked this pull request as ready for review April 4, 2020 19:59
@kesselb
Merge branch 'master' into enh/noid/proc-getmemory
c6d6231 
# Conflicts:
#	lib/OperatingSystems/DefaultOs.php
#	templates/settings-admin.php
@rullzer rullzer mentioned this pull request Apr 9, 2020
Merged
59 tasks
@rullzer rullzer merged commit 310f821 into master Apr 14, 2020
@delete-merged-branch delete-merged-branch bot deleted the enh/noid/proc-getmemory branch April 14, 2020 19:02
@kesselb kesselb mentioned this pull request May 2, 2020
Closed
@joshtrichards joshtrichards mentioned this pull request Jun 6, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rullzer rullzer rullzer approved these changes

@skjnldsv skjnldsv Awaiting requested review from skjnldsv

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

Assignees
No one assigned
Labels
3. to review enhancement
Projects
None yet
Milestone
Nextcloud 19
Development

Successfully merging this pull request may close these issues.
2 participants
@kesselb @rullzer