From: Yoshiyuki Asaba <y-asaba at pgfoundry.org>
Date: Mon, 29 Oct 2007 09:25:53 +0000 (+0000)
Subject: Support the following derectives.
X-Git-Tag: V2_0_0_BETA1~4
X-Git-Url: http://git.postgresql.org/gitweb/static/session/%7B%7Bsession.id%7D%7D-%7B%7Bsession.title%7Cslugify%7D%7D?a=commitdiff_plain;h=b0334504d564c7f4e7fa56cba575eba91513c24f;p=pgpooladmin.git

Support the following derectives.
  - client_idle_limit
  - authentication_timeout
  - recovery_1st_stage_command
  - recovery_2nd_stage_command
  - failover_command
  - failback_command

TODO: translate message catalog.
---

diff --git a/definePgpoolConfParam.php b/definePgpoolConfParam.php
index 35dd75e..5018f55 100644
--- a/definePgpoolConfParam.php
+++ b/definePgpoolConfParam.php
@@ -81,6 +81,18 @@ $pgpoolConfigParam[$key]['default'] ='0';
 $pgpoolConfigParam[$key]['min'] = 0;
 $pgpoolConfigParam[$key]['max'] = 65535;
 
+$key = 'client_idle_limit';
+$pgpoolConfigParam[$key]['type'] ='N';
+$pgpoolConfigParam[$key]['default'] ='0';
+$pgpoolConfigParam[$key]['min'] = 0;
+$pgpoolConfigParam[$key]['max'] = 65535;
+
+$key = 'authentication_timeout';
+$pgpoolConfigParam[$key]['type'] ='N';
+$pgpoolConfigParam[$key]['default'] ='60';
+$pgpoolConfigParam[$key]['min'] = 0;
+$pgpoolConfigParam[$key]['max'] = 10000;
+
 $key = 'logdir';
 $pgpoolConfigParam[$key]['type'] ='C';
 $pgpoolConfigParam[$key]['default'] ='/tmp';
@@ -251,4 +263,24 @@ $pgpoolConfigParam[$key]['type'] ='C';
 $pgpoolConfigParam[$key]['default'] ='';
 $pgpoolConfigParam[$key]['regexp'] = "^[0-9a-zA-Z_\.\-]+$";
 
+$key = 'recovery_1st_stage_command';
+$pgpoolConfigParam[$key]['type'] ='C';
+$pgpoolConfigParam[$key]['default'] ='';
+$pgpoolConfigParam[$key]['regexp'] = "^[0-9a-zA-Z_/\.\-]+$";
+
+$key = 'recovery_2nd_stage_command';
+$pgpoolConfigParam[$key]['type'] ='C';
+$pgpoolConfigParam[$key]['default'] ='';
+$pgpoolConfigParam[$key]['regexp'] = "^[0-9a-zA-Z_/\.\-]+$";
+
+$key = 'failover_command';
+$pgpoolConfigParam[$key]['type'] ='C';
+$pgpoolConfigParam[$key]['default'] ='';
+$pgpoolConfigParam[$key]['regexp'] = "^[0-9a-zA-Z_/\.\-]+$";
+
+$key = 'failback_command';
+$pgpoolConfigParam[$key]['type'] ='C';
+$pgpoolConfigParam[$key]['default'] ='';
+$pgpoolConfigParam[$key]['regexp'] = "^[0-9a-zA-Z_/\.\-]+$";
+
 ?>
diff --git a/lang/ja.lang.php b/lang/ja.lang.php
index 3139b50..480a21e 100644
--- a/lang/ja.lang.php
+++ b/lang/ja.lang.php
@@ -33,9 +33,13 @@ $message = array(
     'descBackend_data_directory' => 'PostgreSQLサーバのデータベースディレクトリ',
     'descChild_life_time' => 'pgpoolの子プロセスの寿命',
     'descChild_max_connections' => '各pgpool子プロセスが終了するまでの接続回数',
+	'descClient_idle_limit' => 'クライアントからのクエリの最大待ち時間(秒)',
+	'descAuthentication_timeout' => 'クライアント認証のタイムアウト時間(秒)',
     'descConnection_cache' => 'コネクションをキャッシュ',
     'descConnection_life_time' => 'コネクションプール中のコネクションの有効期間(秒)',
     'descEnable_query_cache' => 'クエリキャッシュ機能の有効化',
+    'descFailover_command' => 'ノード切り離し時に起動するコマンド',
+    'descFailback_command' => 'ノード復帰時に起動するコマンド',
     'descHealth_check_period' => 'ヘルスチェックを行う間隔(秒)',
     'descHealth_check_timeout' => 'ヘルスチェックが長時間待たされるのを防ぐためのタイムアウト値(秒)',
     'descHealth_check_user' => 'ヘルスチェックを行うためのPostgreSQLユーザ名',
@@ -57,6 +61,8 @@ $message = array(
     'descPrint_timestamp' => 'pgpoolのログにタイムスタンプを追加',
     'descRecovery_user' => 'リカバリを行うためのPostgreSQLユーザ',
     'descRecovery_password' => 'リカバリを行うためのPostgreSQLユーザパスワード',
+    'descRecovery_1st_stage_command' => 'オンラインリカバリ第1ステージで実行するコマンド',
+    'descRecovery_2nd_stage_command' => 'オンラインリカバリ第2ステージで実行するコマンド',
     'descReplication_mode' => 'レプリケーションモードの有効化',
     'descReplication_stop_on_mismatch' => 'trueを指定するとマスタとセカンダリの間でデータの不一致があった場合に強制的に縮退運転',
 	'descReplicate_select' => 'true ならば SELECT をレプリケーションし、false ならばマスタにのみ送信',
diff --git a/templates/pgconfig.tpl b/templates/pgconfig.tpl
index 095f2da..8c5a89d 100644
--- a/templates/pgconfig.tpl
+++ b/templates/pgconfig.tpl
@@ -156,7 +156,8 @@ function cancelNode() {
           <br />connection_life_time (integer)</th>
           {/if}
           <td><input type="text" name="connection_life_time" value="{$params.connection_life_time|escape}"/></td>
-        </tr><tr> {if $error.child_max_connections != null}
+        </tr>
+	<tr> {if $error.child_max_connections != null}
           <th class="error"><label>{$message.descChild_max_connections|escape}</label>
           <br />child_max_connections (integer)</th>
           {else}
@@ -165,6 +166,24 @@ function cancelNode() {
           {/if}
           <td><input type="text" name="child_max_connections" value="{$params.child_max_connections|escape}"/></td>
         </tr>
+	<tr> {if $error.client_idle_limit != null}
+          <th class="error"><label>{$message.descClient_idle_limit|escape}</label>
+          <br />client_idle_limit (integer)</th>
+          {else}
+          <th><label>{$message.descClient_idle_limit|escape}</label>
+          <br />client_idle_limit (integer)</th>
+          {/if}
+          <td><input type="text" name="client_idle_limit" value="{$params.client_idle_limit|escape}"/></td>
+        </tr>
+	<tr> {if $error.authentication_timeout != null}
+          <th class="error"><label>{$message.descAuthentication_timeout|escape}</label>
+          <br />authentication_timeout (integer)</th>
+          {else}
+          <th><label>{$message.descAuthentication_timeout|escape}</label>
+          <br />authentication_timeout (integer)</th>
+          {/if}
+          <td><input type="text" name="authentication_timeout" value="{$params.authentication_timeout|escape}"/></td>
+        </tr>
         <tr> {if $error.connection_cache != null}
           <th class="error"><label>{$message.descConnection_cache|escape}</label>
 					<br />connection_cache</th>
@@ -517,6 +536,24 @@ function cancelNode() {
           {/if}
           <td><input type="password" name="recovery_password" value="{$params.recovery_password|escape}"/></td>
         </tr>
+        <tr> {if $error.recovery_1st_stage_command != null}
+          <th class="error"><label>{$message.descRecovery_1st_stage_command|escape}</label>
+          <br />recovery_1st_stage_command (string)</th>
+          {else}
+          <th><label>{$message.descRecovery_1st_stage_command|escape}</label>
+          <br />recovery_1st_stage_command (string)</th>
+          {/if}
+          <td><input type="text" name="recovery_1st_stage_command" value="{$params.recovery_1st_stage_command|escape}"/></td>
+        </tr>
+        <tr> {if $error.recovery_2nd_stage_command != null}
+          <th class="error"><label>{$message.descRecovery_2nd_stage_command|escape}</label>
+          <br />recovery_2nd_stage_command (string)</th>
+          {else}
+          <th><label>{$message.descRecovery_2nd_stage_command|escape}</label>
+          <br />recovery_2nd_stage_command (string)</th>
+          {/if}
+          <td><input type="text" name="recovery_2nd_stage_command" value="{$params.recovery_2nd_stage_command|escape}"/></td>
+        </tr>
       </tbody>
     </table>
     <h3><a name="system-database" id="system-database">System Database</a></h3>
@@ -687,6 +724,24 @@ function cancelNode() {
           {else}
           <td><input type="checkbox" name="enable_query_cache" id="enable_query_cache" /></td>
           {/if} </tr>
+        <tr> {if $error.failover_command != null}
+          <th class="error"><label>{$message.descFailover_command|escape}</label>
+          <br />failover_command (string)</th>
+          {else}
+          <th><label>{$message.descFailover_command|escape}</label>
+          <br />failover_command (string)</th>
+          {/if}
+          <td><input type="text" name="failover_command" value="{$params.failover_command|escape}"/></td>
+        </tr>
+        <tr> {if $error.failback_command != null}
+          <th class="error"><label>{$message.descFailback_command|escape}</label>
+          <br />failover_command (string)</th>
+          {else}
+          <th><label>{$message.descFailback_command|escape}</label>
+          <br />failover_command (string)</th>
+          {/if}
+          <td><input type="text" name="failback_command" value="{$params.failback_command|escape}"/></td>
+        </tr>
       </tbody>
     </table>
     <p>