mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-12 10:19:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix copy failure logging and stale files removal, introduced in r3025

Browse Source
This commit is contained in:
Igor Sysoev 2009-08-20 13:41:32 +00:00
parent 9db33c9234
commit 0ddc1978ee
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/ngx_file.c
View File

@ -615,24 +615,33 @@ ngx_ext_rename_file(ngx_str_t *src, ngx_str_t *to, ngx_ext_rename_file_t *ext)
if (ngx_copy_file(src->data, name, &cf) == NGX_OK) {
if (ngx_rename_file(name, to->data) == NGX_FILE_ERROR) {
if (ngx_rename_file(name, to->data) != NGX_FILE_ERROR) {
ngx_free(name);
goto failed;
if (ngx_delete_file(src->data) == NGX_FILE_ERROR) {
ngx_log_error(NGX_LOG_CRIT, ext->log, ngx_errno,
ngx_delete_file_n " \"%s\" failed",
src->data);
return NGX_ERROR;
}
return NGX_OK;
}
ngx_free(name);
ngx_log_error(NGX_LOG_CRIT, ext->log, ngx_errno,
ngx_rename_file_n " \"%s\" to \"%s\" failed",
name, to->data);
if (ngx_delete_file(src->data) == NGX_FILE_ERROR) {
if (ngx_delete_file(name) == NGX_FILE_ERROR) {
ngx_log_error(NGX_LOG_CRIT, ext->log, ngx_errno,
ngx_delete_file_n " \"%s\" failed", src->data);
ngx_delete_file_n " \"%s\" failed", name);
return NGX_ERROR;
}
return NGX_OK;
}
ngx_free(name);
err = 0;
}
failed: