Log Message:
-----------
Force port number to be included so that it can be expected in the
slon command line so that slon_start.pl can expect to have all of
(dbname,dbport,dbhost) specified.

Modified Files:
--------------
    slony1-engine/tools/altperl:
        slon-tools.pm (r1.1 -> r1.2)
        slon_start.pl (r1.2 -> r1.3)

-------------- next part --------------
Index: slon-tools.pm
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/slon-tools.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ltools/altperl/slon-tools.pm -Ltools/altperl/slon-tools.pm -u -w -r1.1 -r1.2
--- tools/altperl/slon-tools.pm
+++ tools/altperl/slon-tools.pm
@@ -41,6 +41,8 @@
   if ($port) {
     $loginstr .= " port=$port";
     $PORT[$node] = $port;
+  } else {
+    die ("I need a port number");
   }
   my $password = $PARAMS{'password'};
   if ($password) {
Index: slon_start.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/slon_start.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ltools/altperl/slon_start.pl -Ltools/altperl/slon_start.pl -u -w -r1.2 -r1.3
--- tools/altperl/slon_start.pl
+++ tools/altperl/slon_start.pl
@@ -48,7 +48,7 @@
   my $nodenum = $1;
   my ($dbname, $dbport, $dbhost) = ($DBNAME[$nodenum], $PORT[$nodenum], $HOST[$nodenum]);
 #  print "Searching for PID for $dbname on port $dbport\n";
-  open(PSOUT, "ps -auxww | egrep \"[s]lon $SETNAME\" | egrep \"dbname=$dbname .*port=$dbport\" | sort -n | awk '{print \$2}'|");
+  open(PSOUT, "ps -auxww | egrep \"[s]lon $SETNAME\" | egrep \"host=$dbhost dbname=$dbname.*port=$dbport\" | sort -n | awk '{print \$2}'|");
   $pid = <PSOUT>;
   chop $pid;
   close(PSOUT);