From: Darold Gilles <gilles@darold.net>
Date: Mon, 18 Jan 2016 09:11:51 +0000 (+0100)
Subject: Automatically remove obsolete pid file when there is no other pgbadger process runnin... 
X-Git-Tag: v7.3~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb323bebf9d2b1dd54ab36901455241414412eae;p=pgbadger

Automatically remove obsolete pid file when there is no other pgbadger process running (unix only)
---

diff --git a/pgbadger b/pgbadger
index 7786343..2014763 100755
--- a/pgbadger
+++ b/pgbadger
@@ -448,19 +448,27 @@ if ($enable_checksum) {
 }
 
 # Check if an other process is already running
-if (-f "$PID_DIR/pgbadger.pid") {
-	print "FATAL: an other process is already started or remove the file, see $PID_DIR/pgbadger.pid\n";
-	exit 1;
-} else {
-	# Create pid file
-	unless(open(OUT, ">$PID_DIR/pgbadger.pid")) {
-		print "FATAL: can't create pid file $PID_DIR/pgbadger.pid, $!\n";
+if (-e "$PID_DIR/pgbadger.pid") {
+	my $is_running = 2;
+	if ($^O !~ /MSWin32|dos/i) {
+		eval { $is_running = `ps auwx | grep pgbadger | grep -v grep | wc -l`; chomp($is_running); };
+	}
+	if (!$@ && ($is_running <= 1)) {
+		unlink("$PID_DIR/pgbadger.pid");
+	} else {
+		print "FATAL: an other process is already started or remove the file, see $PID_DIR/pgbadger.pid\n";
 		exit 1;
 	}
-	print OUT $$;
-	close(OUT);
 }
 
+# Create pid file
+unless(open(OUT, ">$PID_DIR/pgbadger.pid")) {
+	print "FATAL: can't create pid file $PID_DIR/pgbadger.pid, $!\n";
+	exit 1;
+}
+print OUT $$;
+close(OUT);
+
 # Rewrite some command line arguments as lists
 &compute_arg_list();