haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 14:50:29 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5053 from haiwen/update-api-error

Browse Source 
add log when update file via wopi/onlyoffice failed
This commit is contained in:
Daniel Pan
2021-12-09 12:12:16 +08:00
committed by GitHub
parent 2b427264cd 381f0d19de
commit 2b2cf4ddf4
2 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
seahub/onlyoffice/views.py
View File

@@ -154,15 +154,18 @@ def onlyoffice_editor_callback(request):
return HttpResponse('{"error": 1}') return HttpResponse('{"error": 1}')
# get file content # get file content
files = { files = {'file': (os.path.basename(file_path), onlyoffice_resp.content)}
'file': onlyoffice_resp.content, data = {'target_file': file_path}
'file_name': os.path.basename(file_path),
'target_file': file_path,
}
# update file # update file
update_url = gen_inner_file_upload_url('update-api', update_token) update_url = gen_inner_file_upload_url('update-api', update_token)
requests.post(update_url, files=files) resp = requests.post(update_url, files=files, data=data)
if resp.status_code != 200:
logger.error('update_url: {}'.format(update_url))
logger.error('parameter file: {}'.format(files['file'][:100]))
logger.error('parameter file_name: {}'.format(files['file_name']))
logger.error('parameter target_file: {}'.format(files['target_file']))
logger.error('response: {}'.format(resp.__dict__))
# 2 - document is ready for saving, # 2 - document is ready for saving,
if status == 2: if status == 2:
@@ -250,10 +253,8 @@ class OnlyofficeConvert(APIView):
file_name = get_file_name_without_ext(file_path) + new_ext file_name = get_file_name_without_ext(file_path) + new_ext
file_name = check_filename_with_rename(repo_id, parent_dir, file_name) file_name = check_filename_with_rename(repo_id, parent_dir, file_name)
files = { files = {'file': (file_name, onlyoffice_resp.content)}
'file': (file_name, onlyoffice_resp.content), data = {'parent_dir': parent_dir}
'parent_dir': parent_dir,
}
upload_url = gen_inner_file_upload_url('upload-api', upload_token) upload_url = gen_inner_file_upload_url('upload-api', upload_token)
try: try:
@@ -273,9 +274,15 @@ class OnlyofficeConvert(APIView):
return prepared_request return prepared_request
requests.post(upload_url, files=files, auth=rewrite_request) resp = requests.post(upload_url, files=files, data=data, auth=rewrite_request)
else: else:
requests.post(upload_url, files=files) resp = requests.post(upload_url, files=files, data=data)
if resp.status_code != 200:
logger.error('upload_url: {}'.format(upload_url))
logger.error('parameter file: {}'.format(files['file'][:100]))
logger.error('parameter parent_dir: {}'.format(files['parent_dir']))
logger.error('response: {}'.format(resp.__dict__))
result = {} result = {}
result['parent_dir'] = parent_dir result['parent_dir'] = parent_dir

15
seahub/wopi/views.py
View File

@@ -440,12 +440,15 @@ class WOPIFilesContentsView(APIView):
update_url = gen_inner_file_upload_url('update-api', token) update_url = gen_inner_file_upload_url('update-api', token)
# update file # update file
files = { files = {'file': (os.path.basename(file_path), file_obj)}
'file': file_obj, data = {'target_file': file_path}
'file_name': os.path.basename(file_path), resp = requests.post(update_url, files=files, data=data)
'target_file': file_path, if resp.status_code != 200:
} logger.error('update_url: {}'.format(update_url))
requests.post(update_url, files=files) logger.error('parameter file: {}'.format(files['file'][:100]))
logger.error('parameter file_name: {}'.format(files['file_name']))
logger.error('parameter target_file: {}'.format(files['target_file']))
logger.error('response: {}'.format(resp.__dict__))
except Exception as e: except Exception as e:
logger.error(e) logger.error(e)
return HttpResponse(json.dumps({}), status=500, return HttpResponse(json.dumps({}), status=500,