<!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">YUKI Hiroshi <shimo****@clear*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2015-04-20 12:12:32 +0900 (Mon, 20 Apr 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/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66">f1849c531c1f1893e0077f7daddf9f49bb0bab66</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">Output more logs while updating clsuter members</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/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#diff-0">lib/droonga-protocol/connection-pool.js</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: lib/droonga-protocol/connection-pool.js (+5 -1)</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/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L124">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L125">125</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L126">126</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L127">127</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/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L128">128</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L129">129</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L130">130</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/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L131">131</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L132">132</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L133">133</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L141">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L142">142</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L143">143</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L144">144</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L145">145</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/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L146">146</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L147">147</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L148">148</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L149">149</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L150">150</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/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L151">151</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L152">152</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L153">153</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L203">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L204">204</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L205">205</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L206">206</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/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L207">207</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L208">208</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0L209">209</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/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R124">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R125">125</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R126">126</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R127">127</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R128">128</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R129">129</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R130">130</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R131">131</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R132">132</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R133">133</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R134">134</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R135">135</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R143">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R144">144</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R145">145</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R146">146</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/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R147">147</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R148">148</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R149">149</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R150">150</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R151">151</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R152">152</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R153">153</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R154">154</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R155">155</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R156">156</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R206">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R207">207</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R208">208</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R209">209</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R210">210</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R211">211</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R212">212</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/express-droonga/commit/f1849c531c1f1893e0077f7daddf9f49bb0bab66#L0R213">213</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">@@ -125,9 +125,11 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">ConnectionPool.prototype = {</span></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-not-changed" style="display: block; white-space: pre"> getEnginesFromCluster: function(retryCount) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ this._logger.info('Getting engine names from cluster.');</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (this._watching)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> return this.getEnginesFromClusterMember(this._serf.rpcAddress);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ this._logger.info('Not watching: getting engine names from predetected member.');</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> retryCount = retryCount || 0;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> var hostName = this._hostNames[retryCount];</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (!hostName)</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -142,12 +144,13 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">ConnectionPool.prototype = {</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> return engines;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> })</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> .catch((function(error) {</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- this._logger.error('Failed to get the list of droonga-engine hosts from the cluster member ' + hostName + '.');</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ this._logger.error('Failed to get the list of droonga-engine hosts from the cluster member ' + hostName + '. Retrying...');</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> this._logger.error(error);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> return this.getEnginesFromCluster(retryCount + 1);</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }).bind(this));</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> },</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> getEnginesFromClusterMember: function(rpcAddress) {</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ this._logger.info('Getting engine names from a cluster member ' + rpcAddress + '.');</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> return Q.Promise((function(resolve, reject, notify) {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (!rpcAddress)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> reject(new Error('no RPC address is given'));</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -204,6 +207,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">ConnectionPool.prototype = {</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if (this.updating)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> return Q.Promise.resolve();</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ this._logger.info('Starting to update host names.');</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> this.updating = true;</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> return this.getEnginesFromCluster()</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> .then((function(engines) {</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>