comparison src/core/ngx_cycle.c @ 2687:5190c5dc3486

delete win32 ngx_file_append_mode() as we use reliable FILE_APPEND_DATA|SYNCHRONIZE flags
author Igor Sysoev <igor@sysoev.ru>
date Wed, 08 Apr 2009 19:13:28 +0000
parents 9e0ae986b587
children 9bcda0da8d36
comparison
equal deleted inserted replaced
2686:9e0ae986b587 2687:5190c5dc3486
373 ngx_open_file_n " \"%s\" failed", 373 ngx_open_file_n " \"%s\" failed",
374 file[i].name.data); 374 file[i].name.data);
375 goto failed; 375 goto failed;
376 } 376 }
377 377
378 #if (NGX_WIN32) 378 #if !(NGX_WIN32)
379 if (ngx_file_append_mode(file[i].fd) != NGX_OK) {
380 ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
381 ngx_file_append_mode_n " \"%s\" failed",
382 file[i].name.data);
383 goto failed;
384 }
385 #else
386 if (fcntl(file[i].fd, F_SETFD, FD_CLOEXEC) == -1) { 379 if (fcntl(file[i].fd, F_SETFD, FD_CLOEXEC) == -1) {
387 ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, 380 ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
388 "fcntl(FD_CLOEXEC) \"%s\" failed", 381 "fcntl(FD_CLOEXEC) \"%s\" failed",
389 file[i].name.data); 382 file[i].name.data);
390 goto failed; 383 goto failed;
1075 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, 1068 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
1076 ngx_open_file_n " \"%s\" failed", file[i].name.data); 1069 ngx_open_file_n " \"%s\" failed", file[i].name.data);
1077 continue; 1070 continue;
1078 } 1071 }
1079 1072
1080 #if (NGX_WIN32) 1073 #if !(NGX_WIN32)
1081 if (ngx_file_append_mode(fd) == NGX_ERROR) {
1082 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
1083 ngx_file_append_mode_n " \"%s\" failed",
1084 file[i].name.data);
1085
1086 if (ngx_close_file(fd) == NGX_FILE_ERROR) {
1087 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
1088 ngx_close_file_n " \"%s\" failed",
1089 file[i].name.data);
1090 }
1091
1092 continue;
1093 }
1094 #else
1095 if (user != (ngx_uid_t) NGX_CONF_UNSET_UINT) { 1074 if (user != (ngx_uid_t) NGX_CONF_UNSET_UINT) {
1096 ngx_file_info_t fi; 1075 ngx_file_info_t fi;
1097 1076
1098 if (ngx_file_info((const char *) file[i].name.data, &fi) == -1) { 1077 if (ngx_file_info((const char *) file[i].name.data, &fi) == -1) {
1099 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, 1078 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,