|
@@ -32,6 +32,7 @@ from desktop.models import Document2, Document
|
|
|
|
|
|
|
|
from notebook.connectors.base import get_api, Notebook, QueryExpired, SessionExpired, QueryError, _get_snippet_name
|
|
from notebook.connectors.base import get_api, Notebook, QueryExpired, SessionExpired, QueryError, _get_snippet_name
|
|
|
from notebook.connectors.hiveserver2 import HS2Api
|
|
from notebook.connectors.hiveserver2 import HS2Api
|
|
|
|
|
+from notebook.connectors.oozie_batch import OozieApi
|
|
|
from notebook.decorators import api_error_handler, check_document_access_permission, check_document_modify_permission
|
|
from notebook.decorators import api_error_handler, check_document_access_permission, check_document_modify_permission
|
|
|
from notebook.models import escape_rows, make_notebook
|
|
from notebook.models import escape_rows, make_notebook
|
|
|
from notebook.views import upgrade_session_properties
|
|
from notebook.views import upgrade_session_properties
|
|
@@ -302,7 +303,7 @@ def get_logs(request):
|
|
|
response['logs'] = logs.strip()
|
|
response['logs'] = logs.strip()
|
|
|
response['progress'] = min(db.progress(snippet, full_log), 99) if snippet['status'] != 'available' and snippet['status'] != 'success' else 100
|
|
response['progress'] = min(db.progress(snippet, full_log), 99) if snippet['status'] != 'available' and snippet['status'] != 'success' else 100
|
|
|
response['jobs'] = jobs
|
|
response['jobs'] = jobs
|
|
|
- response['isFullLogs'] = snippet.get('interface') == 'oozie'
|
|
|
|
|
|
|
+ response['isFullLogs'] = isinstance(db, OozieApi)
|
|
|
response['status'] = 0
|
|
response['status'] = 0
|
|
|
|
|
|
|
|
return JsonResponse(response)
|
|
return JsonResponse(response)
|