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

Update Oshi #892

Merged
merged 14 commits into from
Dec 10, 2023
Merged

Update Oshi #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a2453fe
Remove Mixer source (#853)
TheEssem Mar 27, 2023
0bb5240
Merge branch 'master' into dev
topi314 Apr 8, 2023
8032e3c
Implement full semver spec (#867)
topi314 Apr 20, 2023
b656672
update lavaplayer (#872)
topi314 Apr 28, 2023
06531ef
Merge branch 'master' into dev
topi314 May 18, 2023
313cf0a
use getDuration instead of info.length (#877)
topi314 May 18, 2023
fa7953b
Merge branch 'master' into dev
topi314 Jun 3, 2023
975a26c
bump oshio to 6.4.3
topi314 Jun 9, 2023
97cdc4c
use oshi 5.8.3
topi314 Jun 9, 2023
d9ac377
check process for null
topi314 Jun 9, 2023
40a51fb
let's try oshi 6.4.3 again
topi314 Jun 9, 2023
1f5d157
Merge branch 'v3-legacy' into patch/update-oshi
topi314 Jul 30, 2023
88e0e4a
Merge branch 'v3-legacy' into patch/update-oshi
topi314 Dec 10, 2023
8b99625
update oshi to 6.4.8
topi314 Dec 10, 2023
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
5 changes: 4 additions & 1 deletion LavalinkServer/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,10 @@ dependencies {
implementation(libs.kotlin.reflect)
implementation(libs.logback)
implementation(libs.sentry.logback)
implementation(libs.oshi)
implementation(libs.oshi) {
// This version of SLF4J does not recognise Logback 1.2.3
exclude(group = "org.slf4j", module = "slf4j-api")
}
implementation(libs.json)

compileOnly(libs.spotbugs)
Expand Down
5 changes: 5 additions & 0 deletions LavalinkServer/src/main/java/lavalink/server/io/StatsCollector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ class StatsCollector(val socketServer: SocketServer) {
get() {
val p = os.getProcess(os.processId)

if (p == null) {
log.warn("Could not get process stats, process null")
return 0.0
}

val output: Double = if (cpuTime != 0.0) {
val uptimeDiff = p.upTime - uptime
val cpuDiff = p.kernelTime + p.userTime - cpuTime
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ fun VersionCatalogBuilder.common() {

library("logback", "ch.qos.logback", "logback-classic").version("1.2.3")
library("sentry-logback", "io.sentry", "sentry-logback").version("1.7.2")
library("oshi", "com.github.oshi", "oshi-core").version("5.7.4")
library("oshi", "com.github.oshi", "oshi-core").version("6.4.8")
library("json", "org.json", "json").version("20180813")

library("spotbugs", "com.github.spotbugs", "spotbugs-annotations").version("3.1.6")
Expand Down