Skip to content

fix: groups are not being deleted anymore #30

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

Merged
merged 2 commits into from
Apr 4, 2025
Merged

fix: groups are not being deleted anymore #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8caa38
fix: groups are not being deleted anymore
PrexorJustin Jan 5, 2025
3238f97
fix: potential fix for saving server's to database on windows not wor…
PrexorJustin Jan 5, 2025
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
1 change: 0 additions & 1 deletion ...ler-runtime/src/main/kotlin/app/simplecloud/controller/runtime/YamlDirectoryRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ abstract class YamlDirectoryRepository<E, I>(
if (entity != null) {
watcherEvents.onDelete(entity)
}
deleteFile(resolvedPath.toFile())
}
}
}
Expand Down
4 changes: 1 addition & 3 deletions ...ler-runtime/src/main/kotlin/app/simplecloud/controller/runtime/server/ServerRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,13 @@ class ServerRepository(
) : LoadableRepository<Server, String> {

override suspend fun find(identifier: String): Server? {
return database.context.selectFrom(CLOUD_SERVERS)
return database.context.selectFrom(CLOUD_SERVERS)
.where(CLOUD_SERVERS.UNIQUE_ID.eq(identifier))
.limit(1)
.awaitFirstOrNull()
?.let { record -> mapCloudServersRecordToServer(record) }
}


suspend fun findServerByNumerical(group: String, id: Int): Server? {
return database.context.selectFrom(CLOUD_SERVERS)
.where(
Expand Down Expand Up @@ -121,7 +120,6 @@ class ServerRepository(
}
}

@Synchronized
override fun save(element: Server) {
numericalIdRepository.saveNumericalId(element.group, element.numericalId)

Expand Down
11 changes: 6 additions & 5 deletions ...roller-runtime/src/main/kotlin/app/simplecloud/controller/runtime/server/ServerService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class ServerService(
return stopServer(server.toDefinition(), request.stopCause)
} catch (e: Exception) {
throw StatusException(
Status.INTERNAL.withDescription("Error occured whilest cleaning up stopped server: ").withCause(e)
Status.INTERNAL.withDescription("Error occurred whilst cleaning up stopped server: ").withCause(e)
)
}
}
Expand Down Expand Up @@ -216,7 +216,9 @@ class ServerService(
startedServers.add(server)
}
} catch (e: Exception) {
throw StatusException(Status.INTERNAL.withDescription("Error whilst starting multiple servers").withCause(e))
throw StatusException(
Status.INTERNAL.withDescription("Error whilst starting multiple servers").withCause(e)
)
}

return StartMultipleServerResponse.newBuilder()
Expand Down Expand Up @@ -245,7 +247,6 @@ class ServerService(
val server = buildServer(group, numericalId)
serverRepository.save(server)
val stub = host.stub ?: throw StatusException(Status.INTERNAL.withDescription("Server host has no stub"))
serverRepository.save(server)
try {
val result = stub.startServer(
ServerHostStartServerRequest.newBuilder()
Expand All @@ -263,7 +264,7 @@ class ServerService(
}
}

private suspend fun publishServerStartEvents(server: ServerDefinition, startCause: ServerStartCause) {
private fun publishServerStartEvents(server: ServerDefinition, startCause: ServerStartCause) {
pubSubClient.publish(
"event", ServerStartEvent.newBuilder()
.setServer(server)
Expand Down Expand Up @@ -380,7 +381,7 @@ class ServerService(

try {
timeout?.let {
group.timeout = GroupTimeout(it);
group.timeout = GroupTimeout(it)
}

groupServers.forEach { server ->
Expand Down