--- bin/Replicate	2003/08/05 21:10:28	1.5
+++ bin/Replicate	2003/08/10 13:51:54	1.9
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 # Replicate
 # Vadim Mikheev, (c) 2000, PostgreSQL Inc.
 
@@ -11,6 +11,7 @@
 	unshift(@INC, "$basedir/../share");
 }
 
+use strict;
 use IO::File;
 use Getopt::Long;
 use RServ;
@@ -18,73 +19,112 @@
 
 $| = 1;
 
-$result = GetOptions("debug!", "verbose!", "help", "snapshot=s",
-		     "masterhost=s", "slavehost=s",
-		     "masteruser=s", "slaveuser=s",
-		     "masterpassword=s", "slavepassword=s",
-		     "masterport=i", "slaveport=i"
-		     );
-
-my $debug = $opt_debug || 0;
-my $verbose = $opt_verbose || 0;
-my $snapshot = $opt_snapshot || ".__Snapshot";
+my ($debug,$verbose) = (0,0);
+my ($help,$masterhost,$masterport,$masteruser,$masterpassword,
+	$slavehost,$slaveport,$slaveuser,$slavepassword);
+my $snapshot = ".__Snapshot";
+
+my $result = GetOptions(
+	"debug!" => \$debug, "verbose!" => \$verbose, "help" => \$help,
+	"masterhost=s" => \$masterhost, "masterport=i" => \$masterport,
+	"masteruser=s" => \$masteruser, "masterpassword=s" => \$masterpassword,
+	"slavehost=s" => \$slavehost, "slaveport=i" => \$slaveport,
+	"slaveuser=s" => \$slaveuser, "slavepassword=s" => \$slavepassword,
+	"snapshot=s" => \$snapshot,
+	);
+
+if (defined($help) || (scalar(@ARGV) < 2)) {
+    print "Usage: $0 [options] masterdb slavedb
+Options:
+	--masterhost=hostname --masterport=port
+	--masteruser=username --masterpassword=string
+	--snapshot=snapshot
+";
+    exit ((scalar(@ARGV) < 2)? 1:0);
+}
+
 $snapshot .= '.' . $$;
 
-if (defined($opt_help) || (scalar(@ARGV) < 2)) {
-    print "Usage: $0 --snapshot=file masterdb slavedb\n";
-    print "\t--masterhost=name --masterport=port\n";
-    print "\t--masteruser=name --masterpassword=string\n";
-    print "\t--slavehost=name --slaveport=port\n";
-    print "\t--slaveuser=name --slavepassword=string\n";
-    exit ((scalar(@ARGV) < 2)? 1:0);
+$RServ::quiet = !$verbose;
+if ($debug) {
+	$RServ::quiet = 0;
+	no warnings 'vars';
+	$RServ::debug = $debug;
 }
 
 my $master = $ARGV[0] || "master";
 my $slave = $ARGV[1] || "slave";
 
-$masterhost = $opt_masterhost || hostname;
-$slavehost = $opt_slavehost || hostname;
-
 # first, let's check if a instance is alrealy running
 
-$str = $master.'@'.$masterhost.':'.$slave.'@'.$slavehost;
+my $str = $master;
+$str .= '@'.$masterhost if (defined($masterhost));
+$str .= ':'.$slave;
+$str .= '@'.$slavehost if (defined($slavehost));
 my $fname = "/tmp/.lock_rserv-$str";
 if (-e $fname) {
-    print STDERR "rServ is already running for $str. Remove $fname to override this.\n";
-    exit(1);
+	open(PID,$fname) || die "can't open pid file '$fname'";
+	my $pid = <PID>; chomp($pid);
+	close(PID);
+	open(PS,"ps ax |") || die "can't start ps to check for running rServ with pid $pid\n";
+	my $is_running = 0;
+	while(<PS>) {
+		chomp;
+		$is_running = 1 if (/^\s*$pid\s/);
+	}
+	close(PS);
+	if ($is_running) {
+		print STDERR "rServ [$pid] is already running for $str. Remove $fname to override this.\n";
+		exit(1);
+	} else {
+		print STDERR "found stale pid file, but no running rServ [$pid], overriding.\n";
+	}
 }
 open ARQ, ">$fname" || die "Cannot open $fname: $!\n";
 print ARQ "$$\n";
 close ARQ;
 
+$SIG{__DIE__} = \&mydie;
+sub mydie {
+	unlink $fname;
+	print @_;
+	exit 1;
+}
+
+
 my $minfo = "dbname=$master";
-$minfo = "$minfo host=$opt_masterhost" if (defined($opt_masterhost));
-$minfo = "$minfo user=$opt_masteruser" if (defined($opt_masteruser));
-$minfo = "$minfo password=$opt_masterpassword" if (defined($opt_masterpassword));
-$minfo = "$minfo port=$opt_masterport" if (defined($opt_masterport));
+$minfo = "$minfo host=$masterhost" if (defined($masterhost));
+$minfo = "$minfo port=$masterport" if (defined($masterport));
+$minfo = "$minfo user=$masteruser" if (defined($masteruser));
+$minfo = "$minfo password=$masterpassword" if (defined($masterpassword));
+
 my $sinfo = "dbname=$slave";
-$sinfo = "$sinfo host=$opt_slavehost" if (defined($opt_slavehost));
-$sinfo = "$sinfo user=$opt_slaveuser" if (defined($opt_slaveuser));
-$sinfo = "$sinfo password=$opt_slavepassword" if (defined($opt_slavepassword));
-$sinfo = "$sinfo port=$opt_slaveport" if (defined($opt_slaveport));
+$sinfo = "$sinfo host=$slavehost" if (defined($slavehost));
+$sinfo = "$sinfo port=$slaveport" if (defined($slaveport));
+$sinfo = "$sinfo user=$slaveuser" if (defined($slaveuser));
+$sinfo = "$sinfo password=$slavepassword" if (defined($slavepassword));
 
 print "Master connection is $minfo\n" if ($debug);
 print "Slave connection is $sinfo\n" if ($debug);
 
 my $mconn = Pg::connectdb($minfo);
-if ($mconn->status != PGRES_CONNECTION_OK) {
+if ($mconn->status != Pg::PGRES_CONNECTION_OK) {
     print STDERR "Failed opening $minfo\n";
     unlink $fname;
     exit 1;
 }
 my $sconn = Pg::connectdb($sinfo);
-if ($sconn->status != PGRES_CONNECTION_OK) {
+if ($sconn->status != Pg::PGRES_CONNECTION_OK) {
     print STDERR "Failed opening $sinfo\n";
     unlink $fname;
     exit 1;
 }
 
-my $slaveId = GetSlaveId($mconn, $slave, defined($opt_slavehost) ? $opt_slavehost : hostname);
+$slavehost = hostname if (! $slavehost);
+my $slaveId = GetSlaveId($mconn, $slave, $slavehost);
+
+die "\n>>>>>>>>>>>>> ERROR: Can't GetSlaveID for $sinfo\n" if (! $slaveId);
+
 if ($slaveId < 0) {
     unlink $fname;
     die "\n>>>>>>>>>>>>> ERROR\n";
@@ -94,7 +134,7 @@
 my $outf = new IO::File;
 open $outf, ">$snapshot";
 print "\n>>>>>>>>>>>>> Prepare Snapshot\n\n" if ($verbose);
-$res = PrepareSnapshot($mconn, $sconn, $outf, $slaveId);
+my $res = PrepareSnapshot($mconn, $sconn, $outf, $slaveId);
 close $outf;
 if ($res < 0) {
     unlink $fname;
@@ -136,8 +176,8 @@
 
     print "\n>>>>>>>>>>>>> Sync SyncID\n\n" if ($verbose);
     print "Get last SyncID from Slave DB\n" if ($verbose);
-    $syncid = GetSyncID($sconn);
-    if ($syncid > 0)
+    my $syncid = GetSyncID($sconn);
+    if ($syncid && $syncid > 0)
     {
 	print "Last SyncID applied: $syncid\n" if ($verbose);
 	print "Sync SyncID\n" if ($verbose);