shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2025-02-02 09:47:13 +03:00
Code Issues Releases Wiki Activity

Improved some user service logs

Browse Source
This commit is contained in:
Adolfo Gómez García 2024-09-12 21:07:43 +02:00
parent ba78eb7f33
commit a170596f1d
No known key found for this signature in database
GPG Key ID: DD1ABF20724CDA23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/src/uds/REST/methods/user_services.py
View File

@ -214,9 +214,9 @@ class AssignedService(DetailHandler):
raise self.invalid_item_response() from e
if userservice.user:
logStr = f'Deleted assigned service {userservice.friendly_name} to user {userservice.user.pretty_name} by {self._user.pretty_name}'
log_string = f'Deleted assigned user service {userservice.friendly_name} to user {userservice.user.pretty_name} by {self._user.pretty_name}'
else:
logStr = f'Deleted cached service {userservice.friendly_name} by {self._user.pretty_name}'
log_string = f'Deleted cached user service {userservice.friendly_name} by {self._user.pretty_name}'
if userservice.state in (State.USABLE, State.REMOVING):
userservice.release()
@ -227,7 +227,8 @@ class AssignedService(DetailHandler):
else:
raise self.invalid_item_response(_('Item is not removable'))
log.log(parent, types.log.LogLevel.INFO, logStr, types.log.LogSource.ADMIN)
log.log(parent, types.log.LogLevel.INFO, log_string, types.log.LogSource.ADMIN)
log.log(userservice, types.log.LogLevel.INFO, log_string, types.log.LogSource.ADMIN)
# Only owner is allowed to change right now
def save_item(self, parent: 'Model', item: typing.Optional[str]) -> None:
@ -238,7 +239,7 @@ class AssignedService(DetailHandler):
userService = parent.userServices.get(uuid=process_uuid(item))
user = models.User.objects.get(uuid=process_uuid(fields['user_id']))
logStr = f'Changed ownership of service {userService.friendly_name} from {userService.user} to {user.pretty_name} by {self._user.pretty_name}'
log_string = f'Changed ownership of user service {userService.friendly_name} from {userService.user} to {user.pretty_name} by {self._user.pretty_name}'
# If there is another service that has this same owner, raise an exception
if (
@ -256,7 +257,8 @@ class AssignedService(DetailHandler):
userService.save()
# Log change
log.log(parent, types.log.LogLevel.INFO, logStr, types.log.LogSource.ADMIN)
log.log(parent, types.log.LogLevel.INFO, log_string, types.log.LogSource.ADMIN)
log.log(userService, types.log.LogLevel.INFO, log_string, types.log.LogSource.ADMIN)
def reset(self, parent: 'models.ServicePool', item: str) -> typing.Any:
userService = parent.userServices.get(uuid=process_uuid(item))
@ -314,9 +316,9 @@ class CachedService(AssignedService):
def get_logs(self, parent: 'Model', item: str) -> list[typing.Any]:
parent = ensure.is_instance(parent, models.ServicePool)
try:
userService = parent.cached_users_services().get(uuid=process_uuid(item))
userservice = parent.cached_users_services().get(uuid=process_uuid(item))
logger.debug('Getting logs for %s', item)
return log.get_logs(userService)
return log.get_logs(userservice)
except Exception:
raise self.invalid_item_response() from None