Merge pull request #18 from uptimejp/fix/nosuchfile

Fix/nosuchfile
Fix pt-proc-stat to suppress an exception when the directory is not found. #17

bin/pt-proc-stat

@@ -160,11 +160,15 @@ class PostgresProcessStat():
         # Get pid from postmaster.pid if available.
         if self.pgdata is not None:
             log.debug("reading " + self.pgdata + "/postmaster.pid to to determine the postmaster pid.")
-            f = open(self.pgdata + "/postmaster.pid")
-            for l in f.readlines():
-                pid  = int(l.replace('\n', ''))
-                break
-            f.close()
+            try:
+                f = open(self.pgdata + "/postmaster.pid")
+                for l in f.readlines():
+                    pid  = int(l.replace('\n', ''))
+                    break
+                f.close()
+            except IOError, err:
+                log.error(err.strerror + " (" + self.pgdata + "/postmaster.pid" + ")")
+                sys.exit(1)
 
             if pid is not None:
                 log.debug("found postmaster pid " + str(pid))

bin/t/test-pt-config.sh

@@ -117,6 +117,10 @@ function testConfig003()
     pt-config -D $PGDATA get > $OUT
     contains 'Usage: pt-config \[option...\] \[command\] \[param \[value\]\]' $OUT
     assertTrue $?
+
+    # directory not found
+    pt-config -D nosuchdir get shared_buffers > $OUT
+    assertEquals 1 $?
 }
 
 function testConfig004()

bin/t/test-pt-proc-stat.sh

@@ -81,4 +81,12 @@ function testProcStat004()
     assertEquals 0 $?
 }
 
+function testProcStat005()
+{
+    OUT=${_SHUNIT_TEST_}.out
+
+    sudo env PATH=$PATH pt-proc-stat -D nosuchdir > $OUT
+    assertEquals 1 $?
+}
+
 . shunit2