From 390952e7d03a1ff78eef1e8c5524ff46ce7d6211 Mon Sep 17 00:00:00 2001
From: Tatsuo Ishii <ishii at sraoss.co.jp>
Date: Mon, 16 Aug 2010 06:11:14 +0000
Subject: [PATCH] Adopt for pgpool-II 3.0 pcp_proc_info command.

Add "Backend pid" (process if of PostgreSQL database server process)
and "Frontend connected"(1 if frontend actually connets) to Process
Info.
---
 procInfo.php           |  5 +++--
 templates/procInfo.tpl | 18 ++++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/procInfo.php b/procInfo.php
index 01a8839..b2e8e09 100644
--- a/procInfo.php
+++ b/procInfo.php
@@ -19,7 +19,7 @@
  * is" without express or implied warranty.
  *
  * @author     Ryuma Ando <ando@ecomas.co.jp>
- * @copyright  2003-2008 PgPool Global Development Group
+ * @copyright  2003-2010 PgPool Global Development Group
  * @version    CVS: $Id$
  */
 
@@ -54,10 +54,11 @@ for($i=0; $i<count($procPids); $i++) {
         if(count($ret) > 0) {
             foreach($ret as $line) {
                 $data = split(" ", $line);
-                
+/*                
                 $dateFormat = $message['strDateFormat'];
                 $data[2] = date($dateFormat, $data[2]); 
                 $data[3] = date($dateFormat, $data[3]);
+*/
                 $procInfo[$procPid][]  = $data;
             }
         } else {
diff --git a/templates/procInfo.tpl b/templates/procInfo.tpl
index 0022737..8bb802a 100644
--- a/templates/procInfo.tpl
+++ b/templates/procInfo.tpl
@@ -15,6 +15,8 @@
     <td><label>{$message.strProcTime|escape}</label><br /><label>{$message.strConnTime|escape}</label></td>
     <td><label>{$message.strProtocolMajorVersion|escape}</label><br /><label>{$message.strProtocolNinorVersion|escape}</label></td>
     <td><label>{$message.strConnUsed|escape}</label></td>
+    <td><label>{$message.strBackendPid|escape}</label></td>
+    <td><label>{$message.strFrontendConnected|escape}</label></td>
   </tr>
   </thead>
   {foreach name=proc key=num item=value from=$procInfo}
@@ -27,9 +29,11 @@
       {/if}
         <td rowspan="{$smarty.foreach.data.total}">{$num|escape}</td>
         <td>{$data.0|escape}<br />{$data.1|escape}</td>
-        <td>{$data.2|escape}<br />{$data.3|escape}</td>
-        <td>{$data.4|escape}<br />{$data.5|escape}</td>
-        <td>{$data.6|escape}</td>
+        <td>{$data.2|escape} {$data.3|escape}<br />{$data.4|escape} {$data.5|escape}</td>
+        <td>{$data.6|escape}<br />{$data.7|escape}</td>
+        <td>{$data.8|escape}</td>
+        <td>{$data.9|escape}</td>
+        <td>{$data.10|escape}</td>
       </tr>
     {else}
       {if $smarty.foreach.proc.iteration % 2 == 0}
@@ -38,9 +42,11 @@
       <tr class="odd">
       {/if}
         <td>{$data.0|escape}<br />{$data.1|escape}</td>
-        <td>{$data.2|escape}<br />{$data.3|escape}</td>
-        <td>{$data.4|escape}<br />{$data.5|escape}</td>
-        <td>{$data.6|escape}</td>
+        <td>{$data.2|escape} {$data.3|escape}<br />{$data.4|escape} {$data.5|escape}</td>
+        <td>{$data.6|escape}<br />{$data.7|escape}</td>
+        <td>{$data.8|escape}</td>
+        <td>{$data.9|escape}</td>
+        <td>{$data.10|escape}</td>
       </tr>
     {/if}    
   {/foreach}
-- 
2.39.5