Kouhei Sutou
null+****@clear*****
Mon Jan 26 15:28:09 JST 2015
Kouhei Sutou 2015-01-26 15:28:09 +0900 (Mon, 26 Jan 2015) New Revision: bd0a40f5bc30d0c42043b4fecf4cf705c724171f https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f Message: groonga-httpd: fix a bug that custom log file is ignored Modified files: src/httpd/nginx-module/ngx_http_groonga_module.c Modified: src/httpd/nginx-module/ngx_http_groonga_module.c (+1 -3) =================================================================== --- src/httpd/nginx-module/ngx_http_groonga_module.c 2015-01-26 15:11:22 +0900 (8320efe) +++ src/httpd/nginx-module/ngx_http_groonga_module.c 2015-01-26 15:28:09 +0900 (45fa0c9) @@ -1201,7 +1201,7 @@ ngx_http_groonga_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) GRN_CACHE_DEFAULT_MAX_N_ENTRIES); #ifdef NGX_HTTP_GROONGA_LOG_PATH - { + if (!conf->log_file) { ngx_str_t default_log_path; default_log_path.data = (u_char *)NGX_HTTP_GROONGA_LOG_PATH; default_log_path.len = strlen(NGX_HTTP_GROONGA_LOG_PATH); @@ -1214,8 +1214,6 @@ ngx_http_groonga_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) return NGX_CONF_ERROR; } } -#else - conf->log_file = NULL; #endif ngx_conf_merge_str_value(conf->query_log_path, prev->query_log_path, -------------- next part -------------- HTML����������������������������...Download