From: Nozomi Anzai Date: Thu, 31 May 2012 06:51:15 +0000 (+0900) Subject: Add new pgpoolAdmin's parameter: _PGPOOL_VERSION so that pgpoolAdmin can control... X-Git-Tag: V3_2_1~24 X-Git-Url: http://git.postgresql.org/gitweb/static/developers.postgresql.org?a=commitdiff_plain;h=99c418ac6495a51e15ebf11ce035f0ec65f5885f;p=pgpooladmin.git Add new pgpoolAdmin's parameter: _PGPOOL_VERSION so that pgpoolAdmin can control any pgpool-II version (after V2.0) --- diff --git a/conf/pgmgt.conf.php b/conf/pgmgt.conf.php index 8381360..5dca33a 100644 --- a/conf/pgmgt.conf.php +++ b/conf/pgmgt.conf.php @@ -1,5 +1,6 @@ diff --git a/innerSummary.php b/innerSummary.php index 2ee985b..ac42986 100644 --- a/innerSummary.php +++ b/innerSummary.php @@ -32,6 +32,8 @@ if (!isset($_SESSION[SESSION_LOGIN_USER])) { $params = readConfigParams(array('parallel_mode', 'master_slave_mode', 'master_slave_sub_mode', + 'memory_cache_enabled', + 'memqcache_method', 'enable_query_cache', 'replication_mode', 'load_balance_mode', diff --git a/install/checkParameter.php b/install/checkParameter.php index 9f907e9..b41d658 100644 --- a/install/checkParameter.php +++ b/install/checkParameter.php @@ -196,6 +196,7 @@ if ($error || (isset($_POST['submitBack']) && $_POST['submitBack'] != NULL)) { } else { $params['lang'] = $_SESSION['lang']; + $params['version'] = $_POST['version']; $params['pgpool2_config_file'] = $pgpool2_config_file; $params['password_file'] = $password_file; $params['pcp_client_dir'] = $pcp_client_dir; @@ -211,6 +212,8 @@ if (!$error && $action == 'next') { fputs($fp, "

Welcome to pgpool-II Administration Tool

-

- - + +

+ +
+ + + + +
+ +
+ + +

+ + +
@@ -284,11 +314,16 @@ if (!$error && $action == 'next') {
- -

- + +

+ -
@@ -360,7 +395,6 @@ if (!$error && $action == 'next') {

@@ -388,6 +422,12 @@ else { /* Function */ /* --------------------------------------------------------------------- */ +function versions() +{ + return array('3.2', '3.1', '3.0', + '2.3', '2.2', '2.1', '2.0'); +} + function write($fp, $defname, $val) { fputs($fp, "define('{$defname}', '{$val}');\n"); diff --git a/install/lang/en.lang.php b/install/lang/en.lang.php index 91fe970..f4de87b 100644 --- a/install/lang/en.lang.php +++ b/install/lang/en.lang.php @@ -26,6 +26,7 @@ $message = array( 'lang' => 'en', 'strLang' => 'English', + 'strVersion' => 'pgpool-II version', 'strNext' => 'Next', 'strCheck' => 'Check', 'strDirectoryCheck' => 'Directory Check', diff --git a/install/lang/ja.lang.php b/install/lang/ja.lang.php index 700380f..a0a9577 100644 --- a/install/lang/ja.lang.php +++ b/install/lang/ja.lang.php @@ -26,6 +26,7 @@ $message = array( 'lang' => 'ja', 'strLang' => '日本語', + 'strVersion' => 'pgpool-II バージョン', 'strNext' => '次へ', 'strCheck' => 'チェック', 'strDirectoryCheck' => 'ディレクトリ確認', diff --git a/lang/en.lang.php b/lang/en.lang.php index 95cffe0..951d540 100644 --- a/lang/en.lang.php +++ b/lang/en.lang.php @@ -291,6 +291,7 @@ $message = array( 'strUp' => 'Up', 'strUpdate' => 'Update', 'strValue' => 'Value', + 'strVersion' => 'pgpool-II version', 'strWeight' => 'Weight', 'e1' => 'pgmgt.conf.php not found.', diff --git a/lang/ja.lang.php b/lang/ja.lang.php index ad7feae..c3a0bc6 100644 --- a/lang/ja.lang.php +++ b/lang/ja.lang.php @@ -283,6 +283,7 @@ $message = array( 'strUp' => 'アップ', 'strUpdate' => '更新', 'strValue' => '値', + 'strVersion' => 'pgpool-II バージョン', 'strWeight' => 'ウェイト', 'e1' => 'pgmgt.conf.phpが見つかりません', diff --git a/nodeStatus.php b/nodeStatus.php index baedb7f..13580cd 100644 --- a/nodeStatus.php +++ b/nodeStatus.php @@ -106,7 +106,8 @@ for ($i = 0; $i < $nodeCount; $i++) { } else { array_push($nodeInfo[$i], 'none'); } - if (useStreaming()) { + // pcp_promote_node exists after V3.1 + if (hasPcpPromote() && useStreaming()) { array_push($nodeInfo[$i], 'promote'); } break; diff --git a/pgconfig.php b/pgconfig.php index 66ec637..42cef69 100644 --- a/pgconfig.php +++ b/pgconfig.php @@ -57,7 +57,7 @@ switch ($action) { } else { $configValue[$key] = 'off'; } - } else { + } elseif (isset($_POST[$key])) { $configValue[$key] = trim($_POST[$key]); } } @@ -66,19 +66,19 @@ switch ($action) { if (isset($_POST['backend_hostname'])) { $configValue['backend_hostname'] = $_POST['backend_hostname']; } else { - $configValue['backend_hostname'] = array(); + $configValue['backend_hostname'] = array(); } if (isset($_POST['backend_port'])) { $configValue['backend_port'] = $_POST['backend_port']; } else { - $configValue['backend_port'] = array(); + $configValue['backend_port'] = array(); } if (isset($_POST['backend_weight'])) { $configValue['backend_weight'] = $_POST['backend_weight']; } else { - $configValue['backend_weight'] = array(); + $configValue['backend_weight'] = array(); } if (isset($_POST['backend_data_directory'])) { @@ -87,10 +87,12 @@ switch ($action) { $configValue['backend_data_directory'] = array(); } - if (isset($_POST['backend_flag'])) { - $configValue['backend_flag'] = $_POST['backend_flag']; - } else { - $configValue['backend_flag'] = array(); + if (paramExists('backend_flag')) { + if (isset($_POST['backend_flag'])) { + $configValue['backend_flag'] = $_POST['backend_flag']; + } else { + $configValue['backend_flag'] = array(); + } } $tpl->assign('params', $configValue); @@ -109,7 +111,7 @@ switch ($action) { } else { $configValue[$key] = 'off'; } - } else { + } elseif (isset($_POST[$key])) { $configValue[$key] = trim($_POST[$key]); } } @@ -170,7 +172,7 @@ switch ($action) { } else { $configValue[$key] = 'false'; } - } else { + } elseif (isset($_POST[$key])) { $configValue[$key] = trim($_POST[$key]); } } @@ -178,7 +180,7 @@ switch ($action) { /** * Confirmations of value except backend host */ - foreach( $pgpoolConfigParam as $key => $value) { + foreach ($pgpoolConfigParam as $key => $value) { check($key, $value, $configValue, $error); } @@ -195,59 +197,45 @@ switch ($action) { */ if (isset($configValue['backend_hostname'])) { for ($i = 0; $i < count($configValue['backend_hostname']); $i++) { - $hostname = $configValue['backend_hostname'][$i]; - $port = $configValue['backend_port'][$i]; - $weight = $configValue['backend_weight'][$i]; - $data_directory = $configValue['backend_data_directory'][$i]; - $flag = $configValue['backend_flag'][$i]; - $result = FALSE; // backend_hostname - $result = checkString($hostname, + $result = checkString($configValue['backend_hostname'][$i], $pgpoolConfigBackendParam['backend_hostname']['regexp']); if (!$result) { $error['backend_hostname'][$i] = TRUE; - } else { - $error['backend_hostname'][$i] = FALSE; } // backend_port - $result = checkInteger($port, + $result = checkInteger($configValue['backend_port'][$i], $pgpoolConfigBackendParam['backend_port']['min'], $pgpoolConfigBackendParam['backend_port']['max']); if (!$result) { $error['backend_port'][$i] = TRUE; - } else { - $error['backend_port'][$i] = FALSE; } // backend_weight - $result = checkFloat($weight, + $result = checkFloat($configValue['backend_weight'][$i], $pgpoolConfigBackendParam['backend_weight']['min'], $pgpoolConfigBackendParam['backend_weight']['max']); if (!$result) { $error['backend_weight'][$i] = TRUE; - } else { - $error['backend_weight'][$i] = FALSE; } // backend_data_directory - $result = checkString($data_directory, + $result = checkString($configValue['backend_data_directory'][$i], $pgpoolConfigBackendParam['backend_data_directory']['regexp']); if (!$result) { $error['backend_data_directory'][$i] = TRUE; - } else { - $error['backend_data_directory'][$i] = FALSE; } // backend_flag - $result = checkString($flag, - $pgpoolConfigBackendParam['backend_flag']['regexp']); - if (!$result) { - $error['backend_flag'][$i] = TRUE; - } else { - $error['backend_flag'][$i] = FALSE; + if (paramExists('backend_flag')) { + $result = checkString($configValue['backend_flag'][$i], + $pgpoolConfigBackendParam['backend_flag']['regexp']); + if (!$result) { + $error['backend_flag'][$i] = TRUE; + } } } } @@ -503,7 +491,7 @@ function writeConfigFile($configValue, $pgpoolConfigParam) } if (isset($configValue['backend_hostname'])) { - for ($i = 0; $i diff --git a/screen.css b/screen.css index 21338e1..f48c561 100644 --- a/screen.css +++ b/screen.css @@ -156,6 +156,20 @@ p { border-right: 1px solid lightsteelblue; border-collapse: collapse; } +.message { + margin-top: 10px; + border: 5px solid lightsteelblue; + border-radius: 5px; + background-color: ghostwhite; + padding: 10px; +} +.message h3 { + color: #4682B4; +} +.message p { + font-family: monospace; + border-bottom: 1px dotted #cccccc; +} #help { float: right; diff --git a/templates/config.tpl b/templates/config.tpl index 258f661..70b1cf7 100644 --- a/templates/config.tpl +++ b/templates/config.tpl @@ -51,6 +51,19 @@ {/foreach} + + + (float) + + {if isset($errors.pgpool_config_file)}{else}{/if} diff --git a/templates/innerSummary.tpl b/templates/innerSummary.tpl index 7c3f458..f11146e 100644 --- a/templates/innerSummary.tpl +++ b/templates/innerSummary.tpl @@ -67,10 +67,18 @@ td > img { {$message.strQueryCache|escape} - {if $params.enable_query_cache == 'on'} - {$message.strOn|escape} + {if hasMemqcache()} + {if $params.memory_cache_enabled == 'on'} + {$message.strOn|escape} / {$params.memqcache_method} + {else} + {$message.strOff|escape} + {/if} {else} - {$message.strOff|escape} + {if $params.enable_query_cache == 'on'} + {$message.strOn|escape} + {else} + {$message.strOff|escape} + {/if} {/if} diff --git a/templates/menu.tpl b/templates/menu.tpl index 52490f1..e07b307 100644 --- a/templates/menu.tpl +++ b/templates/menu.tpl @@ -2,7 +2,9 @@ {if $isLogin == 'true'}

  • {$message.strPgpoolStatus|escape}
  • {$message.strNodeStatus|escape}
    • + {if hasMemqCache() == false}
  • {$message.strQueryCache|escape}
    • + {/if}
  • {$message.strSystemDb|escape}
  • {$message.strPgConfSetting|escape}
  • {$message.strSetting|escape}
    • diff --git a/templates/pgconfig.tpl b/templates/pgconfig.tpl index b245456..0fc3ceb 100644 --- a/templates/pgconfig.tpl +++ b/templates/pgconfig.tpl @@ -85,12 +85,17 @@ function cancelNode() {
  • Replication Mode
  • Load Balancing Mode
  • Mater/Slave Mode
    • -
  • Parallel Mode and Query Cache
    • +
  • {if hasMemqcache()}Parallel Mode + {else}Parallel Mode and Query Cache{/if}
  • Health Check
  • Failover and Failback
  • Online Recovery
    • + {if hasMemqcache()}
  • On Memory Query Cache
    • + {/if} + {if paramExists('relcache_expire')}
  • Others
    • + {/if} @@ -121,151 +126,121 @@ function cancelNode() { pgpool Connection Settings - {if isset($error.listen_addresses)} - -
    listen_addresses (string) * - {else} - -
    listen_addresses (string) * - {/if} - + + + +
    listen_addresses (string) * + - {if isset($error.port)} - -
    port (integer) * - {else} - -
    port (integer) * - {/if} - + + + +
    port (integer) * + - {if isset($error.socket_dir)} - -
    socket_dir (string) * - {else} - -
    socket_dir (string) * - {/if} - - + + + +
    socket_dir (string) * + + + + {if paramExists('backend_socket_dir')} + + + +
    backend_socket_dir (string) * + + + {/if} {* --------------------------------------------------------------------- *} pgpool Communication Manager Connection Settings - {if isset($error.pcp_port)} - -
    pcp_port (integer) * - {else} - -
    pcp_port (integer) * - {/if} - + + + +
    pcp_port (integer) * + - {if isset($error.pcp_socket_dir)} - -
    pcp_socket_dir (string) * - {else} - -
    pcp_socket_dir (string) * - {/if} - + + + +
    pcp_socket_dir (string) * + {* --------------------------------------------------------------------- *} Authentication - {if isset($error.enable_pool_hba)} - -
    enable_pool_hba (bool) - {else} - -
    enable_pool_hba (bool) - {/if} - {if $params.enable_pool_hba == 'on'} - - {else} - - {/if} + + + +
    enable_pool_hba (bool) + - {if isset($error.authentication_timeout)} - -
    authentication_timeout (integer) - {else} - -
    authentication_timeout (integer) - {/if} - + + + +
    authentication_timeout (integer) + {* --------------------------------------------------------------------- *} - SSL Connections - - {if isset($error.ssl)} - -
    ssl (bool) - {else} - -
    ssl (bool) - {/if} - {if $params.ssl == 'on'} - - {else} - - {/if} - - - {if isset($error.ssl_key)} - -
    ssl_key (string) - {else} - -
    ssl_key (string) - {/if} - - - - {if isset($error.ssl_cert)} - -
    ssl_cert (string) - {else} - -
    ssl_cert (string) - {/if} - - - - {if isset($error.ssl_ca_cert)} - -
    ssl_ca_cert (string) - {else} - -
    ssl_ca_cert (string) - {/if} - - - - {if isset($error.ssl_ca_cert_dir)} - -
    ssl_ca_cert_dir (string) - {else} - -
    ssl_ca_cert_dir (string) - {/if} - - + {if paramExists('ssl')} + SSL Connections + + + + +
    ssl (bool) + + + + + + +
    ssl_key (string) + + + + + + +
    ssl_cert (string) + + + + + + +
    ssl_ca_cert (string) + + + + + + +
    ssl_ca_cert_dir (string) + + + {/if} {* --------------------------------------------------------------------- * - * Connections * + * Pools * * --------------------------------------------------------------------- *}

    Pools

    @@ -287,68 +262,50 @@ function cancelNode() { Pool size - {if isset($error.num_init_children)} - -
    num_init_children (integer) * - {else} - -
    num_init_children (integer) * - {/if} - + + + +
    num_init_children (integer) * + - {if isset($error.max_pool)} - -
    max_pool (integer) * - {else} - -
    max_pool (integer) * - {/if} - + + + +
    max_pool (integer) * + {* --------------------------------------------------------------------- *} Life time - {if isset($error.child_life_time)} - -
    child_life_time (integer) - {else} - -
    child_life_time (integer) - {/if} - + + + +
    child_life_time (integer) + - {if isset($error.child_max_connections)} - -
    child_max_connections (integer) - {else} - -
    child_max_connections (integer) - {/if} - + + + +
    child_max_connections (integer) + - {if isset($error.connection_life_time)} - -
    connection_life_time (integer) - {else} - -
    connection_life_time (integer) - {/if} - + + + +
    connection_life_time (integer) + - {if isset($error.client_idle_limit)} - -
    client_idle_limit (integer) - {else} - -
    client_idle_limit (integer) - {/if} - + + + +
    client_idle_limit (integer) + @@ -370,118 +327,108 @@ function cancelNode() { {if isset($isAdd) && $isAdd == true} - - - - - - + + + + + + {else} - - - - - - - {/if} - - - {section name=num loop=$params.backend_hostname} - {if isset($error.backend_hostname[num])} - -
    backend_hostname{$smarty.section.num.index} (string) - {else} - -
    backend_hostname{$smarty.section.num.index} (string) - {/if} - - - - - - {if isset($error.backend_port[num])} - -
    backend_port{$smarty.section.num.index|escape} (integer) - {else} - -
    backend_port{$smarty.section.num.index|escape} (integer) - {/if} - - - - {if isset($error.backend_weight[num])} - -
    backend_weight{$smarty.section.num.index|escape} (float) - {else} - -
    backend_weight{$smarty.section.num.index|escape} (float) - {/if} - - - - {if isset($error.backend_data_directory[num])} - -
    backend_data_directory{$smarty.section.num.index|escape} (string) - {else} - -
    backend_data_directory{$smarty.section.num.index|escape} (string) - {/if} - - - - {if isset($error.backend_flag[num])} - -
    backend_flag{$smarty.section.num.index|escape} (string) * - {else} - -
    backend_flag{$smarty.section.num.index|escape} (string) * - {/if} - - - {/section} - - {if isset($isAdd) && $isAdd == true} - - -
    backend_hostname{$smarty.section.num.index} (string) - - - - - - - -
    backend_port{$smarty.section.num.index|escape} (integer) - - - - - -
    backend_weight{$smarty.section.num.index|escape} (float) - - - - - -
    backend_data_directory{$smarty.section.num.index|escape} (string) - - - - - -
    backend_flag{$smarty.section.num.index|escape} * - - + + + + + + {/if} + + + {section name=num loop=$params.backend_hostname} + + + +
    backend_hostname{$smarty.section.num.index} (string) + + + + + + + + +
    backend_port{$smarty.section.num.index|escape} (integer) + + + + + + +
    backend_weight{$smarty.section.num.index|escape} (float) + + + + + + +
    backend_data_directory{$smarty.section.num.index|escape} (string) + + + + {if paramExists('backend_flag')} + + + +
    backend_flag{$smarty.section.num.index|escape} (string) * + + + {/if} + {/section} + + {if isset($isAdd) && $isAdd == true} + + +
    backend_hostname{$smarty.section.num.index} (string) + + + + + + + +
    backend_port{$smarty.section.num.index|escape} (integer) + + + + + +
    backend_weight{$smarty.section.num.index|escape} (float) + + + + + +
    backend_data_directory{$smarty.section.num.index|escape} (string) + + + + {if paramExists('backend_flag')} + + +
    backend_flag{$smarty.section.num.index|escape} * + + + {/if} + {/if} @@ -510,152 +457,120 @@ function cancelNode() { {* --------------------------------------------------------------------- *} - Where to log - - {if isset($error.log_destination)} - -
    master_slave_sub_mode (string) * - {else} -
    log_destination * + {if paramExists('log_destination')} + Where to log + + + {if isset($error.log_destination)}{else}{/if} + +
    log_destination * + + {/if} - - {* --------------------------------------------------------------------- *} What to log - {if isset($error.print_timestamp)} - -
    print_timestamp (bool) * - {else} - -
    print_timestamp (bool) * - {/if} - {if $params.print_timestamp == 'on'} - - {else} - - {/if} - - - {if isset($error.log_connections)} - -
    log_connections (bool) - {else} - -
    log_connections (bool) - {/if} - {if $params.log_connections == 'on'} - - {else} - - {/if} + + + +
    print_timestamp (bool) * + {if $params.print_timestamp == 'on'} + + {/if} - {if isset($error.log_hostname)} - -
    log_hostname (bool) - {else} - -
    log_hostname (bool) - {/if} - {if $params.log_hostname == 'on'} - - {else} - - {/if} + + + +
    log_connections (bool) + {if $params.log_connections == 'on'} + - {if isset($error.log_statement)} - -
    log_statement (bool) - {else} - -
    log_statement (bool) - {/if} - {if $params.log_statement == 'on'} - - {else} - - {/if} + + + +
    log_hostname (bool) + {/if} + - {if isset($error.log_per_node_statement)} - -
    log_per_node_statement (bool) - {else} - -
    log_per_node_statement (bool) - {/if} - {if $params.log_per_node_statement == 'on'} - - {else} - - {/if} - + + + +
    log_statement (bool) + + + + {if paramExists('log_per_node_statement')} + + {if isset($error.log_per_node_statement)}{else}{/if} + +
    log_per_node_statement (bool) + + + {/if} - {if isset($error.log_standby_delay)} -
    log_standby_delay (string) - {else} -
    log_standby_delay (string) - {/if} - - + {if paramExists('log_standby_delay')} + + + +
    log_standby_delay (string) + + + {/if} {* --------------------------------------------------------------------- *} - Syslog specific - - {if isset($error.syslog_facility)} - -
    syslog_facility (string) * - {else} - -
    syslog_facility (string) * - {/if} - - - - {if isset($error.syslog_ident)} - -
    syslog_ident (string) * - {else} - -
    syslog_ident (string) * - {/if} - - + {if paramExists('syslog_facility')} + Syslog specific + + + {if isset($error.syslog_facility)}{else}{/if} + +
    syslog_facility (string) * + + + + + {if isset($error.syslog_ident)}{else}{/if} + +
    syslog_ident (string) * + + + {/if} {* --------------------------------------------------------------------- *} - Debug + {if paramExists('debug_level')} + Debug - {if isset($error.debug_level)} - -
    debug_level (integer) - {else} - -
    debug_level (integer) - {/if} - - + + + +
    debug_level (integer) + + + {/if} @@ -679,25 +594,21 @@ function cancelNode() { - {if isset($error.logdir)} - -
    logdir (string) * - {else} - -
    logdir (string) * - {/if} - - - - {if isset($error.pid_file_name)} - -
    pid_file_name (string) * - {else} - -
    pid_file_name (string) * - {/if} - - + + + +
    logdir (string) * + + + + {if paramExists('pid_file_name')} + + + +
    pid_file_name (string) * + + + {/if} @@ -722,30 +633,20 @@ function cancelNode() { - {if isset($error.connection_cache)} - -
    connection_cache (bool) * - {else} - -
    connection_cache (bool)* - {/if} - {if $params.connection_cache == 'on'} - - {else} - - {/if} + + + +
    connection_cache (bool)* + - {if isset($error.reset_query_list)} - -
    reset_query_list (string) - {else} - -
    reset_query_list (string) - {/if} - + + + +
    reset_query_list (string) + @@ -770,107 +671,74 @@ function cancelNode() { - {if isset($error.replication_mode)} - -
    replication_mode (bool) * - {else} - -
    replication_mode (bool) * - {/if} - {if $params.replication_mode == 'on'} - - {else} - - {/if} - - - {if isset($error.replicate_select)} - -
    replicate_select (bool) - {else} - -
    replicate_select (bool) - {/if} - {if $params.replicate_select == 'on'} - - {else} - - {/if} + + + +
    replication_mode (bool) * + - {if isset($error.insert_lock)} - -
    insert_lock (bool) - {else} - -
    insert_lock (bool) - {/if} - {if $params.insert_lock == 'on'} - - {else} - - {/if} + + + +
    replicate_select (bool) + - {if isset($error.lobj_lock_table)} - -
    lobj_lock_table (string) - {else} - -
    lobj_lock_table (string) - {/if} - - + + + +
    insert_lock (bool) + + + + {if paramExists('lobj_lock_table')} + + + +
    lobj_lock_table (string) + + + {/if} {* --------------------------------------------------------------------- *} Degenerate handling - {if isset($error.replication_stop_on_mismatch)} - -
    replication_stop_on_mismatch (bool) - {else} - -
    replication_stop_on_mismatch (bool) - {/if} - {if $params.replication_stop_on_mismatch == 'on'} - - {else} - - {/if} - - {if isset($error.replication_stop_on_mismatch)} - -
    failover_if_affected_tuples_mismatch (bool) - {else} - -
    failover_if_affected_tuples_mismatch (bool) - {/if} - {if $params.failover_if_affected_tuples_mismatch == 'on'} - - {else} - - {/if} - + + + +
    replication_stop_on_mismatch (bool) + + + + {if paramExists('failover_if_affected_tuples_mismatch')} + + + +
    failover_if_affected_tuples_mismatch (bool) + + + {/if} - {if isset($error.replication_timeout)} - -
    replication_timeout (integer) - {else} - -
    replication_timeout (integer) - {/if} - - + {if paramExists('replication_timeout')} + + + +
    replication_timeout (integer) + + + {/if} @@ -895,57 +763,39 @@ function cancelNode() { - {if isset($error.load_balance_mode)} - -
    load_balance_mode (bool) * - {else} - -
    load_balance_mode (bool) * - {/if} - {if $params.load_balance_mode == 'on'} - - {else} - - {/if} - - - {if isset($error.ignore_leading_white_space)} - -
    ignore_leading_white_space (bool) - {else} - -
    ignore_leading_white_space (bool) - {/if} - {if $params.ignore_leading_white_space == 'on'} - - {else} - - {/if} - - - {if isset($error.white_function_list)} - -
    white_function_list (string) - {else} - -
    white_function_list (string) - {/if} - + + + +
    load_balance_mode (bool) * + - {if isset($error.black_function_list)} - -
    black_function_list (string) - {else} - -
    black_function_list (string) - {/if} - - + + + +
    ignore_leading_white_space (bool) + + + + {if paramExists('white_function_list')} + + + +
    white_function_list (string) + + + + + + +
    black_function_list (string) + + + {/if} @@ -970,94 +820,79 @@ function cancelNode() { - {if isset($error.master_slave_mode)} - -
    master_slave_mode (bool) * - {else} - -
    master_slave_mode (bool) * - {/if} - {if $params.master_slave_mode == 'on'} - - {else} - - {/if} - - - {if isset($error.master_slave_sub_mode)} - -
    master_slave_sub_mode (string) * - {else} - -
    master_slave_sub_mode (string) * - {/if} - - + + + +
    master_slave_mode (bool) * + + + + {if paramExists('master_slave_sub_mode')} + + + +
    master_slave_sub_mode (string) * + + + {/if} {* --------------------------------------------------------------------- *} - Streaming - - {if isset($error.sr_check_period)} - -
    sr_check_period (integer) * - {else} - -
    sr_check_period (integer) * - {/if} - - - - {if isset($error.sr_check_user)} - -
    sr_check_user (string) * - {else} - -
    sr_check_user (string) * - {/if} - - - - {if isset($error.sr_check_password)} - -
    sr_check_password (string) * - {else} - -
    sr_check_password (string) * - {/if} - - + {if paramExists('sr_check_period')} + Streaming + + + + +
    sr_check_period (integer) * + + + + + + +
    sr_check_user (string) * + + + + + + +
    sr_check_password (string) * + + + {/if} - {if isset($error.delay_threshold)} -
    delay_threshold (bool) - {else} -
    delay_threshold (bool) - {/if} - - + {if paramExists('delay_threshold')} + + + +
    delay_threshold (bool) + + + {/if} {* --------------------------------------------------------------------- *} - Special commands + {if paramExists('follow_master_command')} + Special commands - {if isset($error.follow_master_command)} - -
    follow_master_command (string) * - {else} - -
    follow_master_command (string) * - {/if} - - + + + +
    follow_master_command (string) * + + + {/if} @@ -1082,37 +917,27 @@ function cancelNode() { - {if isset($error.parallel_mode)} - -
    parallel_mode (bool) * - {else} - -
    parallel_mode (bool) * - {/if} - {if $params.parallel_mode == 'on'} - - {else} - - {/if} - - - {if isset($error.enable_query_cache)} - -
    enable_query_cache (bool) * - {else} - -
    enable_query_cache (bool) * - {/if} - {if $params.enable_query_cache == 'on'} - - {else} - - {/if} - + + + +
    parallel_mode (bool) * + + + + {if hasMemqcache() == false} + + + +
    enable_query_cache (bool) * + + + {/if} - {if isset($error.pgpool2_hostname)} + + {if isset($error.pgpool2_hostname)}
    pgpool2_hostname (string) * {else} @@ -1126,64 +951,46 @@ function cancelNode() { System DB info - {if isset($error.system_db_hostname)} - -
    system_db_hostname (string) * - {else} - -
    system_db_hostname (string) * - {/if} - + + + +
    system_db_hostname (string) * + - {if isset($error.system_db_port)} - -
    system_db_port (integer) * - {else} - -
    system_db_port (integer) * - {/if} - + + + +
    system_db_port (integer) * + - {if isset($error.system_db_dbname)} - -
    system_db_dbname (string) * - {else} - -
    system_db_dbname (string) * - {/if} - + + + +
    system_db_dbname (string) * + - {if isset($error.system_db_schema)} - -
    system_db_schema (string) * - {else} - -
    system_db_schema (string) * - {/if} - + + + +
    system_db_schema (string) * + - {if isset($error.system_db_user)} - -
    system_db_user (string) * - {else} - -
    system_db_user (string) * - {/if} - + + + +
    system_db_user (string) * + - {if isset($error.system_db_password)} - -
    system_db_password (string) * - {else} - -
    system_db_password (string) * - {/if} - + + + +
    system_db_password (string) * + @@ -1208,65 +1015,51 @@ function cancelNode() { - {if isset($error.health_check_timeout)} - -
    health_check_timeout (integer) - {else} - -
    health_check_timeout (integer) - {/if} - - - - {if isset($error.health_check_period)} - -
    health_check_period (integer) - {else} - -
    health_check_period (integer) - {/if} - - - - {if isset($error.health_check_user)} - -
    health_check_user (string) - {else} - -
    health_check_user (string) - {/if} - + + + +
    health_check_timeout (integer) + - {if isset($error.health_check_password)} - -
    health_check_password (string) - {else} - -
    health_check_password (string) - {/if} - + + + +
    health_check_period (integer) + - {if isset($error.health_check_max_retries)} - -
    health_check_max_retries (integer) - {else} - -
    health_check_max_retries (integer) - {/if} - - + + + +
    health_check_user (string) + + + + {if paramExists('health_check_password')} + + + +
    health_check_password (string) + + + {/if} - {if isset($error.health_check_retry_delay)} - -
    health_check_retry_delay (integer) - {else} - -
    health_check_retry_delay (integer) - {/if} - - + {if paramExists('health_check_max_retries')} + + + +
    health_check_max_retries (integer) + + + + + + +
    health_check_retry_delay (integer) + + + {/if} @@ -1290,40 +1083,30 @@ function cancelNode() { - {if isset($error.failover_command)} - -
    failover_command (string) - {else} - -
    failover_command (string) - {/if} - - - - {if isset($error.failback_command)} - -
    failback_command (string) - {else} - -
    failback_command (string) - {/if} - + + + +
    failover_command (string) + - {if isset($error.fail_over_on_backend_error)} - -
    fail_over_on_backend_error - {else} - -
    fail_over_on_backend_error - {/if} - {if $params.fail_over_on_backend_error == 'on'} - - {else} - - {/if} + + + +
    failback_command (string) + + + + {if paramExists('fail_over_on_backend_error')} + + + +
    fail_over_on_backend_error + + + {/if} @@ -1347,71 +1130,56 @@ function cancelNode() { - {if isset($error.recovery_user)} - -
    recovery_user (string) - {else} - -
    recovery_user (string) - {/if} - - - - {if isset($error.recovery_password)} - -
    recovery_password (string) - {else} - -
    recovery_password (string) - {/if} - + + + +
    recovery_user (string) + - {if isset($error.recovery_1st_stage_command)} - -
    recovery_1st_stage_command (string) - {else} - -
    recovery_1st_stage_command (string) - {/if} - + + + +
    recovery_password (string) + - {if isset($error.recovery_2nd_stage_command)} - -
    recovery_2nd_stage_command (string) - {else} - -
    recovery_2nd_stage_command (string) - {/if} - + + + +
    recovery_1st_stage_command (string) + - {if isset($error.recovery_timeout)} - -
    recovery_timeout (integer) - {else} - -
    recovery_timeout (integer) - {/if} - + + + +
    recovery_2nd_stage_command (string) + - {if isset($error.client_idle_limit_in_recovery)} - -
    client_idle_limit_in_recovery (integer) - {else} - -
    client_idle_limit_in_recovery (integer) - {/if} - - + + + +
    recovery_timeout (integer) + + + + {if paramExists('client_idle_limit_in_recovery')} + + + +
    client_idle_limit_in_recovery (integer) + + + {/if} + {if hasMemqcache()} {* --------------------------------------------------------------------- * * On Memory Query Cache * * --------------------------------------------------------------------- *} @@ -1431,26 +1199,18 @@ function cancelNode() { - {if isset($error.memory_cache_enabled)} - -
    memory_cache_enabled (bool) - {else} - -
    memory_cache_enabled (bool) - {/if} - {if $params.memory_cache_enabled == 'on'} - - {else} - - {/if} + + + +
    memory_cache_enabled (bool) + - {if isset($error.memqcache_method)} - + + +
    memqcache_method (string) * - {else} -
    memqcache_method (string) * - {/if} + + + +
    memqcache_memcached_host (string) * + - {if isset($error.memqcache_memcached_port)} - -
    memqcache_memcached_port (integer) * - {else} - -
    memqcache_memcached_port (integer) * - {/if} - + + + +
    memqcache_memcached_port (integer) * + Shared memory specific - {if isset($error.memqcache_total_size)} - -
    memqcache_total_size (integer) * - {else} - -
    memqcache_total_size (integer) * - {/if} - + + + +
    memqcache_total_size (integer) * + - {if isset($error.memqcache_max_num_cache)} - -
    memqcache_max_num_cache (integer) * - {else} - -
    memqcache_max_num_cache (integer) * - {/if} - + + + +
    memqcache_max_num_cache (integer) * + - {if isset($error.memqcache_cache_block_size)} - -
    memqcache_cache_block_size (integer) * - {else} - -
    memqcache_cache_block_size (integer) * - {/if} - + + + +
    memqcache_cache_block_size (integer) * + Common - {if isset($error.memqcache_expire)} - -
    memqcache_expire (integer) * - {else} - -
    memqcache_expire (integer) * - {/if} - - - - {if isset($error.memqcache_auto_cache_invalidation)} - -
    memqcache_auto_cache_invalidation * - {else} - -
    memqcache_auto_cache_invalidation * - {/if} - {if $params.memqcache_auto_cache_invalidation == 'on'} - - {else} - - {/if} - - - {if isset($error.memqcache_maxcache)} - -
    memqcache_maxcache (integer) * - {else} - -
    memqcache_maxcache (integer) * - {/if} - - - - {if isset($error.memqcache_oiddir)} - -
    memqcache_oiddir (string) * - {else} - -
    memqcache_oiddir (string) * - {/if} - + + + +
    memqcache_expire (integer) * + - {if isset($error.white_memqcache_table_list)} - -
    white_memqcache_table_list (string) - {else} - -
    white_memqcache_table_list (string) - {/if} - + + + +
    memqcache_auto_cache_invalidation * + - {if isset($error.black_memqcache_table_list)} - -
    black_memqcache_table_list (string) - {else} - -
    black_memqcache_table_list (string) - {/if} - + + + +
    memqcache_maxcache (integer) * + - - - - {* --------------------------------------------------------------------- * - * Others * - * --------------------------------------------------------------------- *} -

    Others

    - - - - - + + +
    memqcache_oiddir (string) * +     - - + - + + +
    white_memqcache_table_list (string) +     - - - {if isset($error.relcache_expire)} - - {else} - - {/if} - + + + +
    black_memqcache_table_list (string) +
    {$message.strParameter|escape}{$message.strValue|escape}
    -
    relcache_expire (integer)    		 -
    relcache_expire (integer)
    + {/if} + + {if paramExists('relcache_expire')} + {* --------------------------------------------------------------------- * + * Others * + * --------------------------------------------------------------------- *} +

    Others

    + + + + + + + + + + + + + + + + + + +
    relcache_expire (integer) +     + + + +
    {$message.strParameter|escape}{$message.strValue|escape}
    + {/if} {* --------------------------------------------------------------------- * * Form End * diff --git a/templates/status.tpl b/templates/status.tpl index 9cf57e7..d9d4c5b 100644 --- a/templates/status.tpl +++ b/templates/status.tpl @@ -197,6 +197,9 @@ function changeView(chView){ +

    pgpool-II Version

    +{$smarty.const._PGPOOL2_VERSION} + {* --------------------------------------------------------------------- *} {* Status Info Buttons *} {* --------------------------------------------------------------------- *} @@ -244,6 +247,7 @@ function changeView(chView){ + {if hasMemqCache() == false} {$message.strCmdC|escape} (-c) {if $c == 1} @@ -251,6 +255,7 @@ function changeView(chView){ {/if} + {/if} {$message.strCmdLargeD|escape} (-D) {if $n == 1} @@ -268,6 +273,7 @@ function changeView(chView){ {/if} + {if hasMemqCache()} {$message.strCmdLargeC|escape} (-C) {if $C == 1} @@ -275,6 +281,7 @@ function changeView(chView){ {/if} + {/if} {$message.strCmdD|escape} (-d) {if $d == 1} @@ -360,6 +367,7 @@ function changeView(chView){ + {if hasMemqCache() == false} {$message.strCmdC|escape}(-c) {if $c == 1} @@ -367,6 +375,7 @@ function changeView(chView){ {/if} + {/if} {$message.strCmdLargeD|escape}(-D) {if $n == 1} @@ -384,6 +393,7 @@ function changeView(chView){ {/if} + {if hasMemqCache()} {$message.strCmdLargeC|escape} (-C) {if $C == 1} @@ -391,6 +401,7 @@ function changeView(chView){ {/if} + {/if} {$message.strCmdD|escape}(-d) {if $d == 1} @@ -437,13 +448,20 @@ function changeView(chView){ {/if} {* --------------------------------------------------------------------- *} +{* Start/Stop/Restart messages */ +{* --------------------------------------------------------------------- *} +{if isset($pgpoolStatus)} +
    +

    Messages

    {$pgpoolStatus|escape}

    {foreach from=$pgpoolMessage item=lines} {$lines|escape}
    {/foreach}

    +
    +{/if}