burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

* Fixed so unexpected errors now get logged

Browse Source 
* Added order by so fields are get in order from db
This commit is contained in:
Adolfo Gómez 2013-03-12 13:29:02 +00:00
parent 99b2a3f076
commit 38ced4fea9
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/uds/core/managers/LogManager.py
View File

@ -100,7 +100,7 @@ class LogManager(object):
from uds.models import Log
qs = Log.objects.filter(owner_id = owner_id, owner_type = owner_type)
return [{'date': x.created, 'level': x.level, 'source': x.source, 'message': x.data} for x in reversed(qs.order_by('-created')[:limit])]
return [{'date': x.created, 'level': x.level, 'source': x.source, 'message': x.data} for x in reversed(qs.order_by('-created', '-id')[:limit])]
def __clearLogs(self, owner_type, owner_id):
'''

5
server/src/uds/core/managers/UserServiceManager.py
View File

@ -38,6 +38,7 @@ from uds.core.jobs.DelayedTask import DelayedTask
from uds.core.jobs.DelayedTaskRunner import DelayedTaskRunner
from uds.core.services.Exceptions import OperationException
from uds.core.util.State import State
from uds.core.util import log
from uds.core.util.Config import GlobalConfig
from uds.core.services.Exceptions import MaxServicesReachedException
from uds.models import UserService, getSqlDatetime
@ -118,6 +119,7 @@ class UserServiceOpChecker(DelayedTask):
UserServiceOpChecker.checkLater(userService, userServiceInstance)
except Exception as e:
logger.exception('Checkin service state')
log.doLog(userService, log.ERROR, 'Exception: {0}'.format(e), log.INTERNAL)
userService.setState(State.ERROR)
userService.save()
@ -137,6 +139,7 @@ class UserServiceOpChecker(DelayedTask):
@transaction.commit_manually
def run(self):
logger.debug('Checking user service finished {0}'.format(self._svrId))
uService = None
try:
uService = UserService.objects.select_for_update().get(pk=self._svrId)
if uService.state != self._state:
@ -154,6 +157,8 @@ class UserServiceOpChecker(DelayedTask):
except Exception, e:
# Exception caught, mark service as errored
logger.exception("Error {0}, {1} :".format(e.__class__, e))
if uService is not None:
log.doLog(uService, log.ERROR, 'Exception: {0}'.format(e), log.INTERNAL)
try:
uService.setState(State.ERROR)
uService.save()