<!DOCTYPE html>
<html>
<head>
</head>
<body>
<dl style="line-height: 1.5; margin-left: 2em">
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Author</dt>
<dd style="margin-left: 8.5em">Kouhei Sutou <kou****@clear*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2015-01-26 15:28:09 +0900 (Mon, 26 Jan 2015)</dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">New Revision</dt>
<dd style="margin-left: 8.5em"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f">bd0a40f5bc30d0c42043b4fecf4cf705c724171f</a></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Message</dt>
<dd style="margin-left: 8.5em"><pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; padding: 0.5em; width: auto">groonga-httpd: fix a bug that custom log file is ignored</pre></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Modified files</dt>
<dd style="margin-left: 8.5em">
<ul>
<li><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#diff-0">src/httpd/nginx-module/ngx_http_groonga_module.c</a></li>
</ul>
</dd>
</dl>
<div class="diff-section" style="clear: both">
<table style="border-collapse: collapse; border: 1px solid #aaa">
<thead>
<tr class="diff-header" style="border: 1px solid #aaa">
<td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: src/httpd/nginx-module/ngx_http_groonga_module.c (+1 -3)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
</td>
</tr>
</thead>
<tbody>
<tr>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0L1200">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0L1201">1201</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0L1202">1202</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0L1203">1203</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0L1204">1204</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0L1205">1205</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0L1206">1206</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0L1207">1207</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0L1213">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0L1214">1214</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0L1215">1215</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0L1216">1216</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0L1217">1217</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0L1218">1218</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0L1219">1219</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0L1220">1220</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0L1221">1221</a></span>
</pre>
</th>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0R1200">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0R1201">1201</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0R1202">1202</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0R1203">1203</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0R1204">1204</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0R1205">1205</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0R1206">1206</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0R1207">1207</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0R1213">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0R1214">1214</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0R1215">1215</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0R1216">1216</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0R1217">1217</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0R1218">1218</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/groonga/groonga/commit/bd0a40f5bc30d0c42043b4fecf4cf705c724171f#L0R1219">1219</a></span>
</pre>
</th>
<td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -1201,7 +1201,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">ngx_http_groonga_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> GRN_CACHE_DEFAULT_MAX_N_ENTRIES);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> #ifdef NGX_HTTP_GROONGA_LOG_PATH</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ if (!conf->log_file) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ngx_str_t default_log_path;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> default_log_path.data = (u_char *)NGX_HTTP_GROONGA_LOG_PATH;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> default_log_path.len = strlen(NGX_HTTP_GROONGA_LOG_PATH);</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -1214,8 +1214,6 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">ngx_http_groonga_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> return NGX_CONF_ERROR;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-#else</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- conf->log_file = NULL;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> #endif</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ngx_conf_merge_str_value(conf->query_log_path, prev->query_log_path,</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>