From 2b8f0a2f5b8089c957cb3bb002f850c9fcaaf67d Mon Sep 17 00:00:00 2001
From: Yugo Nagata <nagata@sraoss.co.jp>
Date: Wed, 17 Jul 2013 16:52:24 +0900
Subject: [PATCH] Replace variable name PgpoolIsActive to PgpoolIsRunning

This was a confusable name in watchdog context.
---
 innerNodeServerStatus.php                     |   6 +++---
 lang/en.lang.php                              |   2 +-
 nodeServerStatus.php                          |   4 ++--
 nodeStatus.php                                |   6 +++---
 status.php                                    |  18 +++++++++---------
 templates/elements/.status_js.tpl.swp         | Bin 0 -> 16384 bytes
 templates/elements/.status_nodeinfo.tpl.swp   | Bin 0 -> 16384 bytes
 templates/elements/.status_options.tpl.swp    | Bin 0 -> 16384 bytes
 .../elements/.status_pgsql_buttons.tpl.swp    | Bin 0 -> 12288 bytes
 templates/elements/status_options.tpl         |   2 +-
 templates/elements/status_pgsql_buttons.tpl   |   2 +-
 templates/elements/status_pgsql_options.tpl   |   4 ++--
 templates/elements/status_stop_option.tpl     |   2 +-
 templates/innerNodeServerStatus.tpl           |   2 +-
 templates/nodeServerStatus.tpl                |   2 +-
 templates/status.tpl                          |   8 ++++----
 16 files changed, 29 insertions(+), 29 deletions(-)
 create mode 100644 templates/elements/.status_js.tpl.swp
 create mode 100644 templates/elements/.status_nodeinfo.tpl.swp
 create mode 100644 templates/elements/.status_options.tpl.swp
 create mode 100644 templates/elements/.status_pgsql_buttons.tpl.swp

diff --git a/innerNodeServerStatus.php b/innerNodeServerStatus.php
index f42db35..a35bf4f 100644
--- a/innerNodeServerStatus.php
+++ b/innerNodeServerStatus.php
@@ -46,14 +46,14 @@ if (isset($params['backend_hostname'])) {
     $backendHostPort = array();
 }
 
-$is_pgpool_active = DoesPgpoolPidExist();
+$is_pgpool_running = DoesPgpoolPidExist();
 $nodeInfo = array();
 foreach($backendHostName as $num => $hostname) {
     $nodeInfo[$num]['hostname'] = $backendHostName[$num];
     $nodeInfo[$num]['port']     = $backendPort[$num];
     $nodeInfo[$num]['is_active'] = NodeActive($num);
 
-    if ($is_pgpool_active) {
+    if ($is_pgpool_running) {
         $result = getNodeInfo($num);
         $nodeInfo[$num]['status'] = $result['status'];
     }
@@ -63,7 +63,7 @@ foreach($backendHostName as $num => $hostname) {
 $nodeNum = (isset($_GET['num'])) ? $_GET['num'] : NULL;
 
 // Set vars
-$tpl->assign('pgpoolIsActive',   $is_pgpool_active);
+$tpl->assign('pgpoolIsRunning',   $is_pgpool_running);
 $tpl->assign('nodeServerStatus', $nodeInfo);
 $tpl->assign('nodeCount',        count($nodeInfo));
 $tpl->assign('nodeNum',          $nodeNum);
diff --git a/lang/en.lang.php b/lang/en.lang.php
index b3c694f..f10528b 100644
--- a/lang/en.lang.php
+++ b/lang/en.lang.php
@@ -332,7 +332,7 @@ $message = array(
     'strStopPgpool' => 'Stop pgpool',
     'strStopPgsql' => 'Stop',
     'strStopPgsqlOption' => 'Stop PostgreSQL Option',
-    'strStoppingNow' => 'Not active',
+    'strStoppingNow' => 'Not Running',
     'strStreamingRepMode' => 'Streaming Replication mode',
     'strSummary' => 'Summary',
     'strSystemDb' => 'Partitioning Rule',
diff --git a/nodeServerStatus.php b/nodeServerStatus.php
index 0f41113..2fa29ec 100644
--- a/nodeServerStatus.php
+++ b/nodeServerStatus.php
@@ -39,6 +39,6 @@ if (!isset($_SESSION[SESSION_LOGIN_USER])) {
 $tpl->assign('help', basename( __FILE__, '.php'));
 
 // Display
-$is_pgpool_active = DoesPgpoolPidExist();
-$tpl->assign('pgpoolIsActive', $is_pgpool_active);
+$is_pgpool_running = DoesPgpoolPidExist();
+$tpl->assign('pgpoolIsRunning', $is_pgpool_running);
 $tpl->display('nodeServerStatus.tpl');
diff --git a/nodeStatus.php b/nodeStatus.php
index c675f5e..e79fed8 100644
--- a/nodeStatus.php
+++ b/nodeStatus.php
@@ -46,8 +46,8 @@ $backends_in_conf = $configValue['backend_hostname'];
 
 // Get nodes' status
 $nodeCount = NULL;
-$is_pgpool_active = DoesPgpoolPidExist();
-if ($is_pgpool_active) {
+$is_pgpool_running = DoesPgpoolPidExist();
+if ($is_pgpool_running) {
     $nodeCount = getNodeCount();
 }
 $has_not_loaded_node = FALSE;
@@ -126,7 +126,7 @@ $tpl->assign('parallelMode',  $isParallelMode);
 $tpl->assign('msgStopPgpool', $message['msgStopPgpool']);
 $tpl->assign('nodeCount',     $nodeCount);
 $tpl->assign('has_not_loaded_node', $has_not_loaded_node);
-$tpl->assign('pgpoolIsActive', $is_pgpool_active);
+$tpl->assign('pgpoolIsRunning', $is_pgpool_running);
 
 // Set params
 $configValue = readConfigParams('recovery_1st_stage');
diff --git a/status.php b/status.php
index e8122b6..17f7d48 100644
--- a/status.php
+++ b/status.php
@@ -36,7 +36,7 @@ if (!isset($_SESSION[SESSION_LOGIN_USER])) {
     exit();
 }
 
-$is_pgpool_active = DoesPgpoolPidExist();
+$is_pgpool_running = DoesPgpoolPidExist();
 
 // Do action
 $nodeNumber = (isset($_POST['nodeNumber'])) ? $_POST['nodeNumber'] : -1;
@@ -46,7 +46,7 @@ $viewPHP    = _doAction($action, $nodeNumber);
 // Set vars
 setNodeInfoFromConf();
 $tpl->assign('action',         $action);
-$tpl->assign('pgpoolIsActive', $is_pgpool_active);
+$tpl->assign('pgpoolIsRunning', $is_pgpool_running);
 $tpl->assign('viewPHP',        $viewPHP);
 $tpl->assign('help',           basename( __FILE__, '.php'));
 $tpl->assign('pgpoolConf',     _PGPOOL2_CONFIG_FILE);
@@ -61,7 +61,7 @@ $tpl->assign('login_user',     $_SESSION[SESSION_LOGIN_USER]);
 $tpl->assign('is_superuser',   isSuperUser($_SESSION[SESSION_LOGIN_USER]));
 
 // Set params
-$configValue = readConfigParams('use_watchdog');
+$configValue = readConfigParams();
 $tpl->assign('params', $configValue);
 
 // Set pgpool command option
@@ -199,9 +199,9 @@ function _doAction($action, $nodeNumber)
 function setNodeInfoFromConf()
 {
     global $tpl;
-    global $is_pgpool_active;
+    global $is_pgpool_running;
 
-    if (!$is_pgpool_active) {
+    if (!$is_pgpool_running) {
         $nodeInfo = array();
 
         $configValue = readConfigParams(array('backend_hostname', 'backend_port'));
@@ -401,7 +401,7 @@ function _execPcp($pcp_command, $nodeNumber, $errorCode)
 /** Add a new backend and reload conf */
 function _addNewBackend()
 {
-    global $is_pgpool_active;
+    global $is_pgpool_running;
     global $_POST;
 
     // Check
@@ -437,7 +437,7 @@ function _addNewBackend()
 
     // Reload pgpool
     $result = TRUE;
-    if (isset($_POST['reload_ok']) && $is_pgpool_active) {
+    if (isset($_POST['reload_ok']) && $is_pgpool_running) {
         $result = execPcp('PCP_RELOAD_PGPOOL', NO_ARGS);
     }
 
@@ -447,7 +447,7 @@ function _addNewBackend()
 /** Remove a backend and reload conf */
 function _removeBackend()
 {
-    global $is_pgpool_active;
+    global $is_pgpool_running;
     global $_POST;
 
     if (!isset($_POST['nodeNumber'])) { return FALSE; }
@@ -502,7 +502,7 @@ function _removeBackend()
 
     // Reload pgpool
     $result = TRUE;
-    if ($is_pgpool_active) {
+    if ($is_pgpool_running) {
         $result = execPcp('PCP_RELOAD_PGPOOL', NO_ARGS);
     }
     return $result;
diff --git a/templates/elements/.status_js.tpl.swp b/templates/elements/.status_js.tpl.swp
new file mode 100644
index 0000000000000000000000000000000000000000..d0b92b63378d6cf93dd2b69bad9cdbc42b8733f3
GIT binary patch
literal 16384
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
Fe*;PjZJGc8

literal 0
HcmV?d00001

diff --git a/templates/elements/.status_nodeinfo.tpl.swp b/templates/elements/.status_nodeinfo.tpl.swp
new file mode 100644
index 0000000000000000000000000000000000000000..91ae4d79070a3866cbafe48f09d882a80e19ffb1
GIT binary patch
literal 16384
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

literal 0
HcmV?d00001

diff --git a/templates/elements/.status_options.tpl.swp b/templates/elements/.status_options.tpl.swp
new file mode 100644
index 0000000000000000000000000000000000000000..d098658a1b33b33d60b0196abffccedbcc21d4f9
GIT binary patch
literal 16384
zcmeI3%WvF79LI-1p{2BxRz)BXOihs5ppBapHK_IG(6m623QY>-fCTccXLn7!w&R&i
ziIz}A1vC{B;vtZ@pq{vakl@0F!i56_i5?IKPKby2A9~<Bp7DA&S@PUO6^x}%Y-i{3
z+wVMn^V-tEvnNl{k->um*DgXP9{Y3rj|-oX)6Ww!)2K#;P=2uV<<-h@VQ6HeF!b=@
zr9!@<612}n$)sKN#b6w9QB4@13I?O3YRA<$iUQZG`=KpZJq}#KxXl7qXQALW7p`dV
z7ou4BQOE~H94wWY`OGL_6v!25h)Us+9pupPP}<ZVu=deCyPwHFH%~?ZqkvJsC}0#Y
z3K#{90!9I&z<*u=5%-bv_?CV8o1WG88y4Je)bDrd`?Cu^*RSSg6fg=H1&jhl0i%FX
zz$jo8FbWt2i~>dhqri2jfa?)LVb}X|!jJv`Z2ten?S$08z2F{jZ6_f=f_X3pX2C<?
ze(?7WLVg85fG<G=4ub)37uXKwZzJRba0$$T*T69NZ95_Ff_K2vU@N$KD<K!a6JQIN
z-$ux{;2SUn_JN<a5^^3)fN`)B^nuTBA>=Z+1Wtfm;L6Q}yaiqbAt-?YpkNR9c?%&Q
zgZIEi@Fo}mf89jLhu|344ekKnV<F^gFbSRm$H6r$o_q(+fiW-w9t3xT-=XWL;4+XJ
zr#dfF4=66j7H%nEqeQ=yB5y{$H2ts~G(1Kte!z;>!s8J*C6NeyNJ5^Gux8UFmW>s~
ziz7KA&lUzHqxe&aBB2aPjr6i-X(z5}H)z1BW`CV=?pE0#7s;3#mRayJ<7GEyvlg|p
zIF2924MD|Bj3}js5K(B+(5>UG9M$V?=vg$vxAn`D_)nV3>GX`qu{7-C2oSJj{{f4n
zd1rsR*>K_|R&EHkULzQinP92L%91>DM|iXx1w3}cqBU%(@8~GK9B7x?=!hC~y;1p&
z$BytFlIc92O3%7vMnnCYEP}Kg(sXp1Z8fD5C3WhS<q?^prB2KY#<e(;6^CtP{ZO_)
zim(=~Gf|7Yq9qUGz-pCb?a=5->_IRU-t(uak3>4sSJof*r!C6GjI6BFKKDz0;ES0f
zwB~yr3y)Id>q~QwP`AXR0EMKrYYxytFD^Quo4^3ovQlLkr)#_N^m<`lLE5KOv>~Gw
z)RqOQpW9oBQY|aaF!I=wje3bCR@U-b&8wqvbw*S5qZNgVC{{HhkG%Ho$8;ns>CI$E
za;ByG2K6E`gPwOGd2Lxm|Iy8oMV&{U^7Yqq$S<(YZUddoCiEP-OY7zXCs+`<o@(it
zPsv++doQz`FIH|aPc5&%Y4+VSZ}U9s%e}+NEHxD9W```uUPzEv)~*&fnMc$E85M~C
zn=?!uV<0_W>IpW$^^K_k71f65YO>nf22|iC3pi_ez)f{~t&vdP3KsaiwGMgD<fE)b
zbsgj8)wZ>^<npGrvH_>vHilnz63}((&@l^G;rKN*cmrHdtHf62dk|}(Ez<ck{R-`m
z(+R~%KG6t6KdjPXkycz)BYW8jkyfh7x_t;*U@z^G^Z&h=pU(j~|IhaKuVBtU2WCM6
zrobe45!?r^V&4A-cpXfFac~su1>3+cNbf7~3HS)S4P+h{fw_zVMggOMQNSo*6fg=H
z1&jhl0i(eGT7jnRSJXa*lWzma<r&A0)joiHY07;8=9X(JX!@`Izz-SEmKmH<l5emf
zf(}nBNmMWD+3qQ|H%EQ^%DR}w&XaT6a>H{|N5SM3KfZ2dlG)^79<5X3j@_}MTMk^#
zi<aI8#LAYOZu^`wvA-kD16cd%<%~9)Y1?w8&(3yyv>B_}@)@vuY8O!@Ok|n06|u9K
MJ3SpMr|F{CKj+ml>Hq)$

literal 0
HcmV?d00001

diff --git a/templates/elements/.status_pgsql_buttons.tpl.swp b/templates/elements/.status_pgsql_buttons.tpl.swp
new file mode 100644
index 0000000000000000000000000000000000000000..f0919ba8af5a31476efcad378e1cbc6434376123
GIT binary patch
literal 12288
zcmeI&!EVzq7yw|GGX(@MU_!MHu_h}Z%7Jp&E~~`Q7=j~}n>fL$W1HA1n!1eV08Tss
z4}kUv@DLn0@(lcG+A^V%9grqf{FZ(>Rb2c3zo>_(|7iQ=V4wE<Z35#OA@A?}c=r9%
zXL9h0kfS`&9aY|_AJOa3bh^D>r+fcF-O7_{!{DvX#z7*SZ?ttu#_b#F>nsUOVzibl
zN`(p>PmN@b+ki`+a^-Ab9do%IngrGlN4axaS>G91cO>3J0Td_&au;_VHp#ua-Puq5
zmUolhxc&ldPyhu`00mG01yBG5Pyhw~BLQa`<Q>#|X<qZy`P}$po`1v%1yBG5Pyhu`
z00mG01yBG5Pyhu`U=0OWM9AbaA>Sa%|Nj^7|EF+KKs<%mhiF24y+X)Ghz}4x#Lp%n
zrx0Hto<KAp%6(>gt)T^`i~=Zt0w{n2D1ZVefC4D6P6D(V6DD)s_ol6sTgwveTbCX3
zR8RO03&&hV$J~a@@WOjc=3kkLn6|10<bgfRl@cnU8ymExbi@ZL*8c2jsPfbocE~~}
zCcKD*Wh2R>X&~Z)JQB*}j=CcQhgS{C9@T1Big4WbES$Tm)0C-bvz?vIroBa{%iW7D
z+Wwt*YLk_Tw{Lsoc#-?+a;0X`LD?()mtyM*qy0XOnY8~@;WB~q>Z=x(z2A#e%kt{0
qgJ$r|U2J*KsJ=XO51yjr+2)z&c23IAoi-PnuU(wDGwYRKo$@cfN?eKn

literal 0
HcmV?d00001

diff --git a/templates/elements/status_options.tpl b/templates/elements/status_options.tpl
index 3eade1d..3dae499 100644
--- a/templates/elements/status_options.tpl
+++ b/templates/elements/status_options.tpl
@@ -2,7 +2,7 @@
 {* Start Options                                                         *}
 {* --------------------------------------------------------------------- *}
 
-{if $pgpoolIsActive == false}
+{if $pgpoolIsRunning == false}
     <h3>{$message.strStartOption|escape}</h3>
 
     <form action="status.php" name="startPgpoolForm" method="post">
diff --git a/templates/elements/status_pgsql_buttons.tpl b/templates/elements/status_pgsql_buttons.tpl
index 431e7bf..4f23e02 100644
--- a/templates/elements/status_pgsql_buttons.tpl
+++ b/templates/elements/status_pgsql_buttons.tpl
@@ -11,5 +11,5 @@
        value="{$message.strReloadPgsql|escape}">
 |
 <input type="button" onClick="sendCommand('removeBackend', {$node_num}, '{$message.msgRemoveBackend|escape}')"
-       {if $pgpoolIsActive && $nodeInfo.$node_num.is_active}disabled{/if}
+       {if $pgpoolIsRunning && $nodeInfo.$node_num.is_active}disabled{/if}
        value="{$message.strRemoveBackend|escape}">
diff --git a/templates/elements/status_pgsql_options.tpl b/templates/elements/status_pgsql_options.tpl
index ca4532a..771def4 100644
--- a/templates/elements/status_pgsql_options.tpl
+++ b/templates/elements/status_pgsql_options.tpl
@@ -5,7 +5,7 @@
       onSubmit="return execStopPgsql()" />
 <table>
 <thead>
-    <tr><th colspan="2">{$message.strCmdM|escape}(-m)</th></tr>
+    <tr><th colspan="2">{$message.strCmdM|escape} (-m)</th></tr>
 </thead>
 <tbody>
     {include file="elements/status_stop_option.tpl"}
@@ -29,7 +29,7 @@
       onSubmit="return execRestartPgsql()" />
 <table>
 <thead>
-    <tr><th colspan="2">{$message.strCmdM|escape}(-m)</th></tr>
+    <tr><th colspan="2">{$message.strCmdM|escape} (-m)</th></tr>
 </thead>
 <tbody>
     {include file="elements/status_stop_option.tpl"}
diff --git a/templates/elements/status_stop_option.tpl b/templates/elements/status_stop_option.tpl
index 513f56b..47674eb 100644
--- a/templates/elements/status_stop_option.tpl
+++ b/templates/elements/status_stop_option.tpl
@@ -1,4 +1,4 @@
-<tr><td>{$message.strCmdM|escape}(-m)</td><td>
+<tr><td>{$message.strCmdM|escape} (-m)</td><td>
   <select name="stop_mode">
   {if $m == 's'}
        <option value="s" selected="selected">smart</option>
diff --git a/templates/innerNodeServerStatus.tpl b/templates/innerNodeServerStatus.tpl
index 4834b83..8556345 100644
--- a/templates/innerNodeServerStatus.tpl
+++ b/templates/innerNodeServerStatus.tpl
@@ -25,7 +25,7 @@
     <td class="input">{$nodeServerStatus.$node_num.hostname|escape}</td>
     <td class="input">{$nodeServerStatus.$node_num.port|escape}</td>
     <td>
-    {if $pgpoolIsActive}
+    {if $pgpoolIsRunning}
         {if $nodeServerStatus.$node_num.status == $smarty.const.NODE_ACTIVE_NO_CONNECT}
           {$message.strNodeStatus1|escape}
         {elseif $nodeServerStatus.$node_num.status == $smarty.const.NODE_ACTIVE_CONNECTED}
diff --git a/templates/nodeServerStatus.tpl b/templates/nodeServerStatus.tpl
index e20643d..3639290 100644
--- a/templates/nodeServerStatus.tpl
+++ b/templates/nodeServerStatus.tpl
@@ -85,7 +85,7 @@ function showDetail(num)
 <div id="help"><a href="help.php?help={$help|escape}"><img src="images/question.gif" alt="help"/>{$message.strHelp|escape}</a></div>
 
 <h2>{$message.strNodeStatus|escape}
-{if $pgpoolIsActive == false}[{$message.strStoppingNow}]{/if}
+{if $pgpoolIsRunning == false}[{$message.strStoppingNow}]{/if}
 </h2>
   <div id="status">{$message.strPleaseWait|escape}</div>
 <p>
diff --git a/templates/status.tpl b/templates/status.tpl
index 2051345..b25f5cf 100644
--- a/templates/status.tpl
+++ b/templates/status.tpl
@@ -67,7 +67,7 @@
       {/if}
     {/if}
 
-    {if $pgpoolIsActive == true}
+    {if $pgpoolIsRunning == true}
         <p>
         <input type="button" name="command" onClick="changeView('summary')"
                {if $action == 'summary'}class="command_active"{/if}
@@ -141,7 +141,7 @@
     {/if}
 
     {* ---------------------------------------------------------------------- *}
-    {* Form to add a new backend                                              *}
+    {* Form to add a new backend (Initially invisible)                        *}
     {* ---------------------------------------------------------------------- *}
 
     <div id="addBackendDiv" style="visibility: hidden; position: absolute;">
@@ -175,7 +175,7 @@
     </div>
 
     {* --------------------------------------------------------------------- *}
-    {* Form of options to stop/restart PostgreSQL                            *}
+    {* Form of options to stop/restart PostgreSQL (Initially invisible)      *}
     {* --------------------------------------------------------------------- *}
 
     {include file="elements/status_pgsql_options.tpl"}
@@ -185,7 +185,7 @@
     {* --------------------------------------------------------------------- *}
 
     <h2>{$message.strPgpool|escape}
-    {if !$pgpoolIsActive}[ {$message.strStoppingNow|escape} ]{/if}
+    {if !$pgpoolIsRunning}[ {$message.strStoppingNow|escape} ]{/if}
     </h2>
     {include file="elements/status_options.tpl"}
 
-- 
2.39.5