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.

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

fix(freebsd): fix cpu count for load graph #733

Merged
merged 1 commit into from
Jan 18, 2025

Conversation

ConstrictM
Copy link
Contributor

@ConstrictM ConstrictM commented Jan 17, 2025

Follow-up for #711

Nextcloud version: 30.0.5

FreeBSD is showing "CPU info not available". The reason is the CPU count function is not calling the command correctly.

Fix Tested:
image

@ConstrictM ConstrictM force-pushed the bugfix-freebsdcpuviewer branch from 2bd7827 to a99fbf3 Compare January 17, 2025 21:06
Copy link
Member

@joshtrichards joshtrichards left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

} catch (RuntimeException) {
return $numCpu;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return $numCpu;

Should be unnecessary since we're pre-initializing $numCpu and returning it anyhow at the end of the function, but also doesn't hurt. I see we're doing this elsewhere already so I guess leave it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was my thought process. It should be consistent with the rest. Or all of the exception returns should be removed.

@joshtrichards
Copy link
Member

Can you edit your commit message? We're using conventional commits through more of our repositories these days. The requirement was recently activated here in this one too.

https://www.conventionalcommits.org/en/v1.0.0/#summary

@ConstrictM ConstrictM force-pushed the bugfix-freebsdcpuviewer branch from a99fbf3 to 61f1b20 Compare January 18, 2025 16:38
@ConstrictM ConstrictM changed the title BugFix/Fix CPU Count Function for FreeBSD fix(freebsd): fix cpu count for load graph Jan 18, 2025
@kesselb kesselb merged commit 775ac34 into nextcloud:master Jan 18, 2025
39 checks passed
@kesselb
Copy link
Collaborator

kesselb commented Jan 18, 2025

/backport to stable30

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants