Skip to content

Dev/andres&janier/v4.0 logout unused #171

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
dkmstr merged 2 commits into from
May 5, 2026
Merged

Dev/andres&janier/v4.0 logout unused #171

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
674d5e7
Improves unused service release to trigger logout flow
aschumann-virtualcable Apr 30, 2026
35765c9
Improves user service release to handle logout logic
aschumann-virtualcable May 4, 2026
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
7 changes: 5 additions & 2 deletions server/src/uds/osmanagers/LinuxOsManager/linux_osmanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
from django.utils.translation import gettext_noop as _

from uds.core import osmanagers, types
from uds.core.managers.userservice import UserServiceManager
from uds.core.ui import gui
from uds.core.util import fields, log
from uds.core.types.states import State
Expand Down Expand Up @@ -115,10 +116,12 @@ def handle_unused(self, userservice: 'UserService') -> None:
log.log(
userservice,
types.log.LogLevel.INFO,
'Unused user service for too long. Removing due to OS Manager parameters.',
'Unused user service for too long. Releasing (logout) due to OS Manager parameters.',
types.log.LogSource.OSMANAGER,
)
userservice.release()
osmanagers.OSManager.logged_out(userservice, username='unused')
# release_from_logout handles cache return if pool allows it, else releases
UserServiceManager.manager().release_from_logout(userservice)

def is_persistent(self) -> bool:
return fields.onlogout_field_is_persistent(self.on_logout)
Expand Down
7 changes: 5 additions & 2 deletions server/src/uds/osmanagers/WindowsOsManager/windows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from django.utils.translation import gettext_noop as _

from uds.core import osmanagers, types
from uds.core.managers.userservice import UserServiceManager
from uds.core.ui import gui
from uds.core.util import log, fields
from uds.core.types.states import State
Expand Down Expand Up @@ -107,10 +108,12 @@ def handle_unused(self, userservice: 'UserService') -> None:
log.log(
userservice,
types.log.LogLevel.INFO,
'Unused user service for too long. Removing due to OS Manager parameters.',
'Unused user service for too long. Releasing (logout) due to OS Manager parameters.',
types.log.LogSource.OSMANAGER,
)
userservice.release()
osmanagers.OSManager.logged_out(userservice, username='unused')
# release_from_logout handles cache return if pool allows it, else releases
UserServiceManager.manager().release_from_logout(userservice)

def is_persistent(self) -> bool:
return fields.onlogout_field_is_persistent(self.on_logout)
Expand Down
9 changes: 6 additions & 3 deletions server/src/uds/workers/assigned_unused.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@

from django.db.models import Q, Count

from uds.core import types
from uds.core import types, osmanagers
from uds.core.jobs import Job
from uds.core.managers.userservice import UserServiceManager
from uds.core.util import log
from uds.core.util.config import GlobalConfig
from uds.core.types.states import State
Expand Down Expand Up @@ -96,6 +97,8 @@ def run(self) -> None:
us,
types.log.LogLevel.INFO,
source=types.log.LogSource.SERVER,
message='Removing unused assigned service',
message='Releasing (logout) unused assigned service',
)
us.release()
osmanagers.OSManager.logged_out(us, username='unused')
# release_from_logout handles cache return if pool allows it, else releases
UserServiceManager.manager().release_from_logout(us)
Loading