Add new start option "-D".

Add the input part for pcp_timeout to the pgpoolAdmin parameters' form.
Fix copyright year.

4 files changed, 48 insertions, 1 deletions

diff --git a/install/checkParameter.php b/install/checkParameter.php
index 8540f67..191b54a 100644
--- a/install/checkParameter.php
+++ b/install/checkParameter.php
@@ -101,6 +101,7 @@ else if(!is_executable($pgpool_command)) {
 }
 
 $msgCmdC = '';
+$msgCmdLargeD = '';
 $msgCmdD = '';
 $msgCmdN = '';
 $msgCmdM = '';
@@ -165,6 +166,14 @@ else {
     $pcp_hostname =  _PGPOOL2_PCP_HOSTNAME;
 }
 
+if(isset($_POST['pcp_timeout']) && $_POST['pcp_timeout']) {
+    $pcp_timeout= $_POST['pcp_timeout'];
+}
+else {
+    $pcp_timeout =  _PGPOOL2_PCP_TIMEOUT;
+    $msgPcpTimeout = '';
+}
+
 if(isset($_POST['pcp_refreshTime']) && $_POST['pcp_refreshTime']) {
     $pcp_refreshTime = $_POST['pcp_refreshTime'];
 }
@@ -211,6 +220,12 @@ if(!$error && $action == 'next') {
         $c = 0;
     }
     
+    if(isset($_POST['D'])) {
+        $D = 1;
+    } else {
+        $D = 0;
+    }
+    
     if(isset($_POST['d'])) {
         $d = 1;
     } else {
@@ -226,6 +241,9 @@ if(!$error && $action == 'next') {
     $str = 'define(\'_PGPOOL2_CMD_OPTION_C\', \'' . $c . '\');' . "\n";
     fputs($fp, $str);
     
+    $str = 'define(\'_PGPOOL2_CMD_OPTION_LARGE_D\', \'' . $D . '\');' . "\n";
+    fputs($fp, $str);
+    
     $str = 'define(\'_PGPOOL2_CMD_OPTION_D\', \'' . $d . '\');' . "\n";
     fputs($fp, $str);
     
@@ -337,6 +355,19 @@ if(!$error && $action == 'next') {
     </td>
   </tr>
   <tr>
+    <th><label><?php echo $message['strCmdLargeD'] ?></label></th>
+      <td><input type="checkbox" name="D" /></td>
+    <?php
+    if($msgCmdLargeD != '') {
+        echo '<br />' . $msgCmdLargeD;
+        echo '</td><td><img src="images/ng.gif" alt="ng" />';
+    } else {
+        echo '</td><td><img src="images/ok.gif" alt="ok" />';
+    }
+    ?>
+    </td>
+  </tr>
+  <tr>
     <th><label><?php echo $message['strCmdN'] ?></label></th>
       <td><input type="checkbox" name="n" /></td>
     <?php
@@ -421,6 +452,19 @@ if(!$error && $action == 'next') {
     </td>
   </tr>
   <tr>
+    <th><label><?php echo $message['strPcpTimeout'] ?></label></th>
+                  <td><input name="pcp_timeout" type="text" value="<?php echo $pcp_timeout?>" size="50" />
+    <?php
+    if($msgPcpHostname != '') {
+        echo '<br />' . $msgPcpHostname;
+        echo '</td><td><img src="images/ng.gif" alt="ng" />';
+    } else {
+        echo '</td><td><img src="images/ok.gif" alt="ok" />';
+    }
+    ?>
+    </td>
+  </tr>
+  <tr>
     <th><label><?php echo $message['strPcpRefreshTime'] ?></label></th>
                   <td><input name="pcp_refreshTime" type="text" value="<?php echo $pcp_refreshTime ?>" size="50" />
     <?php
@@ -449,7 +493,7 @@ echo '<input type="submit" value="' . $message['strNext'] . '" />';
 </div>
     <div id="footer">
       <address>Version <?php echo $version;?><br />
-      Copyright &copy; 2006 - 2008 <a href="http://pgpool.projects.postgresql.org/">pgpool Global Development Group</a>. All rights reserved.</address>
+      Copyright &copy; 2006 - <?php echo date('Y'); ?> <a href="http://pgpool.projects.postgresql.org/">pgpool Global Development Group</a>. All rights reserved.</address>
     </div>
   </body>
 </html>
diff --git a/install/defaultParameter.php b/install/defaultParameter.php
index 8a051de..71bf13e 100644
--- a/install/defaultParameter.php
+++ b/install/defaultParameter.php
@@ -27,6 +27,7 @@ define("_PGPOOL2_CONFIG_FILE", "/usr/local/etc/pgpool.conf");
 define("_PGPOOL2_PASSWORD_FILE", "/usr/local/etc/pcp.conf");
 define("_PGPOOL2_COMMAND", "/usr/local/bin/pgpool");
 define("_PGPOOL2_CMD_OPTION_C", "0");
+define("_PGPOOL2_CMD_OPTION_LARGE_D", "0");
 define("_PGPOOL2_CMD_OPTION_D", "0");
 define("_PGPOOL2_CMD_OPTION_M", "s");
 define("_PGPOOL2_CMD_OPTION_N", "0");
diff --git a/install/lang/en.lang.php b/install/lang/en.lang.php
index 8ed5130..bb6f7c1 100644
--- a/install/lang/en.lang.php
+++ b/install/lang/en.lang.php
@@ -40,6 +40,7 @@ $message = array(
     'strCmdC' => 'Clears query cache',
     'strCmdD' => 'debug mode',
     'strCmdM' => 'stop mode',
+    'strCmdLargeD' => 'Discard pgpool_status file',
     'strCmdN' => 'don\'t run in daemon mode',
     'strCmdPgpoolFile' => 'pgpool.conf',
     'strCmdPcpFile' => 'pcp.conf',
diff --git a/install/lang/ja.lang.php b/install/lang/ja.lang.php
index 5a700e1..ec57016 100644
--- a/install/lang/ja.lang.php
+++ b/install/lang/ja.lang.php
@@ -40,6 +40,7 @@ $message = array(
     'strCmdC' => 'クエリキャッシュクリア',
     'strCmdD' => 'デバッグモード',
     'strCmdM' => '停止モード',
+    'strCmdLargeD' => 'pgpool_status を無視',
     'strCmdN' => '非デーモンモード',
     'strCmdPgpoolFile' => 'pgpool.conf',
     'strCmdPcpFile' => 'pcp.conf',