|
@@ -24,7 +24,6 @@ from liboozie.oozie_api import get_oozie
|
|
|
|
|
|
|
|
from jobbrowser.apis.base_api import Api, MockDjangoRequest
|
|
from jobbrowser.apis.base_api import Api, MockDjangoRequest
|
|
|
from liboozie.utils import format_time
|
|
from liboozie.utils import format_time
|
|
|
-from oozie.views.dashboard import get_oozie_job_log
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
LOG = logging.getLogger(__name__)
|
|
@@ -32,7 +31,7 @@ LOG = logging.getLogger(__name__)
|
|
|
|
|
|
|
|
try:
|
|
try:
|
|
|
from oozie.conf import OOZIE_JOBS_COUNT
|
|
from oozie.conf import OOZIE_JOBS_COUNT
|
|
|
- from oozie.views.dashboard import list_oozie_coordinator
|
|
|
|
|
|
|
+ from oozie.views.dashboard import list_oozie_coordinator, get_oozie_job_log, massaged_oozie_jobs_for_json
|
|
|
except Exception, e:
|
|
except Exception, e:
|
|
|
LOG.exception('Some application are not enabled: %s' % e)
|
|
LOG.exception('Some application are not enabled: %s' % e)
|
|
|
|
|
|
|
@@ -46,16 +45,16 @@ class ScheduleApi(Api):
|
|
|
|
|
|
|
|
return {
|
|
return {
|
|
|
'apps':[{
|
|
'apps':[{
|
|
|
- 'id': app.id,
|
|
|
|
|
- 'name': app.appName,
|
|
|
|
|
- 'status': app.status,
|
|
|
|
|
- 'apiStatus': self._api_status(app.status),
|
|
|
|
|
|
|
+ 'id': app['id'],
|
|
|
|
|
+ 'name': app['appName'],
|
|
|
|
|
+ 'status': app['status'],
|
|
|
|
|
+ 'apiStatus': self._api_status(app['status']),
|
|
|
'type': 'schedule',
|
|
'type': 'schedule',
|
|
|
- 'user': app.user,
|
|
|
|
|
- 'progress': app.get_progress(),
|
|
|
|
|
- 'duration': 10 * 3600,
|
|
|
|
|
- 'submitted': 10 * 3600
|
|
|
|
|
- } for app in jobs.jobs],
|
|
|
|
|
|
|
+ 'user': app['user'],
|
|
|
|
|
+ 'progress': app['progress'],
|
|
|
|
|
+ 'duration': app['durationInMillis'],
|
|
|
|
|
+ 'submitted': app['startTimeInMillis']
|
|
|
|
|
+ } for app in massaged_oozie_jobs_for_json(jobs.jobs, self.user)['jobs']],
|
|
|
'total': jobs.total
|
|
'total': jobs.total
|
|
|
}
|
|
}
|
|
|
|
|
|