diff options
Diffstat (limited to 'automation/server/monitor')
| -rw-r--r-- | automation/server/monitor/__init__.py | 1 | ||||
| -rw-r--r-- | automation/server/monitor/dashboard.py | 50 | ||||
| -rwxr-xr-x | automation/server/monitor/manage.py | 4 | ||||
| -rw-r--r-- | automation/server/monitor/settings.py | 6 | ||||
| -rw-r--r-- | automation/server/monitor/urls.py | 18 |
5 files changed, 34 insertions, 45 deletions
diff --git a/automation/server/monitor/__init__.py b/automation/server/monitor/__init__.py index e69de29b..8b137891 100644 --- a/automation/server/monitor/__init__.py +++ b/automation/server/monitor/__init__.py @@ -0,0 +1 @@ + diff --git a/automation/server/monitor/dashboard.py b/automation/server/monitor/dashboard.py index 33d7c3d7..f6befed8 100644 --- a/automation/server/monitor/dashboard.py +++ b/automation/server/monitor/dashboard.py @@ -1,5 +1,3 @@ -#!/usr/bin/python -# # Copyright 2011 Google Inc. All Rights Reserved. # @@ -19,7 +17,6 @@ from django.shortcuts import render_to_response from django.template import Context from django.views import static - Link = namedtuple('Link', 'href name') @@ -29,8 +26,8 @@ def GetServerConnection(): def MakeDefaultContext(*args): context = Context({'links': [ - Link('/job-group', 'Job Groups'), - Link('/machine', 'Machines')]}) + Link('/job-group', 'Job Groups'), Link('/machine', 'Machines') + ]}) for arg in args: context.update(arg) @@ -39,6 +36,7 @@ def MakeDefaultContext(*args): class JobInfo(object): + def __init__(self, job_id): self._job = pickle.loads(GetServerConnection().GetJob(job_id)) @@ -60,12 +58,9 @@ class JobInfo(object): commands = enumerate(job.PrettyFormatCommand().split('\n'), start=1) - return {'text': [('Label', job.label), - ('Directory', job.work_dir)], - 'link': [('Group', group), - ('Predecessors', predecessors), - ('Successors', successors), - ('Machines', machines), + return {'text': [('Label', job.label), ('Directory', job.work_dir)], + 'link': [('Group', group), ('Predecessors', predecessors), + ('Successors', successors), ('Machines', machines), ('Logs', logs)], 'code': [('Command', commands)]} @@ -77,8 +72,8 @@ class JobInfo(object): for evlog in self._job.timeline.GetTransitionEventHistory()] def GetLog(self): - log_path = os.path.join( - self._job.logs_dir, '%s.gz' % self._job.log_filename_prefix) + log_path = os.path.join(self._job.logs_dir, + '%s.gz' % self._job.log_filename_prefix) try: log = gzip.open(log_path, 'r') @@ -104,9 +99,10 @@ class JobInfo(object): class JobGroupInfo(object): + def __init__(self, job_group_id): - self._job_group = pickle.loads( - GetServerConnection().GetJobGroup(job_group_id)) + self._job_group = pickle.loads(GetServerConnection().GetJobGroup( + job_group_id)) def GetAttributes(self): group = self._job_group @@ -159,9 +155,9 @@ class JobGroupInfo(object): class JobGroupListInfo(object): + def __init__(self): - self._all_job_groups = pickle.loads( - GetServerConnection().GetAllJobGroups()) + self._all_job_groups = pickle.loads(GetServerConnection().GetAllJobGroups()) def _GetJobGroupState(self, group): return str(group.status) @@ -188,7 +184,8 @@ def JobPageHandler(request, job_id): ctx = MakeDefaultContext({ 'job_id': job_id, 'attributes': job.GetAttributes(), - 'timeline': job.GetTimeline()}) + 'timeline': job.GetTimeline() + }) return render_to_response('job.html', ctx) @@ -196,9 +193,7 @@ def JobPageHandler(request, job_id): def LogPageHandler(request, job_id): job = JobInfo(int(job_id)) - ctx = MakeDefaultContext({ - 'job_id': job_id, - 'log_lines': job.GetLog()}) + ctx = MakeDefaultContext({'job_id': job_id, 'log_lines': job.GetLog()}) return render_to_response('job_log.html', ctx) @@ -210,7 +205,8 @@ def JobGroupPageHandler(request, job_group_id): 'group_id': job_group_id, 'attributes': group.GetAttributes(), 'job_list': group.GetJobList(), - 'reports': group.GetReportList()}) + 'reports': group.GetReportList() + }) return render_to_response('job_group.html', ctx) @@ -218,8 +214,10 @@ def JobGroupPageHandler(request, job_group_id): def JobGroupFilesPageHandler(request, job_group_id, path): group = JobGroupInfo(int(job_group_id)) - return static.serve( - request, path, document_root=group.GetHomeDirectory(), show_indexes=True) + return static.serve(request, + path, + document_root=group.GetHomeDirectory(), + show_indexes=True) class FilterJobGroupsForm(forms.Form): @@ -245,9 +243,7 @@ def JobGroupListPageHandler(request): else: form = FilterJobGroupsForm({'initial': '*'}) - ctx = MakeDefaultContext({ - 'filter': form, - 'groups': group_list}) + ctx = MakeDefaultContext({'filter': form, 'groups': group_list}) return render_to_response('job_group_list.html', ctx) diff --git a/automation/server/monitor/manage.py b/automation/server/monitor/manage.py index 1733753c..57deb5c2 100755 --- a/automation/server/monitor/manage.py +++ b/automation/server/monitor/manage.py @@ -8,7 +8,7 @@ __author__ = 'kbaclawski@google.com (Krystian Baclawski)' from django.core.management import execute_manager try: - import settings # Assumed to be in the same directory. + import settings # Assumed to be in the same directory. except ImportError: import sys @@ -16,5 +16,5 @@ except ImportError: 'containing %r.' % __file__) sys.exit(1) -if __name__ == "__main__": +if __name__ == '__main__': execute_manager(settings) diff --git a/automation/server/monitor/settings.py b/automation/server/monitor/settings.py index 9048da50..8cd20e35 100644 --- a/automation/server/monitor/settings.py +++ b/automation/server/monitor/settings.py @@ -1,5 +1,3 @@ -#!/usr/bin/python -# # Copyright 2011 Google Inc. All Rights Reserved. # # Django settings for monitor project. @@ -48,6 +46,4 @@ SECRET_KEY = '13p5p_4q91*8@yo+tvvt#2k&6#d_&e_zvxdpdil53k419i5sop' ROOT_URLCONF = 'monitor.urls' # List of locations of the template source files, in search order. -TEMPLATE_DIRS = ( - os.path.join(ROOT_PATH, 'templates'), -) +TEMPLATE_DIRS = (os.path.join(ROOT_PATH, 'templates'),) diff --git a/automation/server/monitor/urls.py b/automation/server/monitor/urls.py index 19a1ef9c..1a6b2485 100644 --- a/automation/server/monitor/urls.py +++ b/automation/server/monitor/urls.py @@ -1,5 +1,3 @@ -#!/usr/bin/python -# # Copyright 2011 Google Inc. All Rights Reserved. # @@ -9,17 +7,15 @@ from django.conf import settings from django.conf.urls.defaults import patterns urlpatterns = patterns( - 'dashboard', - (r'^job-group$', 'JobGroupListPageHandler'), + 'dashboard', (r'^job-group$', 'JobGroupListPageHandler'), (r'^machine$', 'MachineListPageHandler'), (r'^job/(?P<job_id>\d+)/log$', 'LogPageHandler'), - (r'^job/(?P<job_id>\d+)$', 'JobPageHandler'), - (r'^job-group/(?P<job_group_id>\d+)/files/(?P<path>.*)$', - 'JobGroupFilesPageHandler'), + (r'^job/(?P<job_id>\d+)$', 'JobPageHandler'), ( + r'^job-group/(?P<job_group_id>\d+)/files/(?P<path>.*)$', + 'JobGroupFilesPageHandler'), (r'^job-group/(?P<job_group_id>\d+)$', 'JobGroupPageHandler'), (r'^$', 'DefaultPageHandler')) -urlpatterns += patterns( - '', - (r'^static/(?P<path>.*)$', 'django.views.static.serve', - {'document_root': settings.MEDIA_ROOT})) +urlpatterns += patterns('', + (r'^static/(?P<path>.*)$', 'django.views.static.serve', + {'document_root': settings.MEDIA_ROOT})) |