Merge lp:~paulgear/charms/trusty/ntp/fix-trusty-exceptions-psutil-1.2.x into lp:charms/trusty/ntp

[Paul Gear]

Trusty has python-psutils 1.2.x; check_ntpmon.py was written against 2.1.x. This allows the code to work with both versions of psutils.

[Adam Israel (aisrael)]

Hi Paul,

Thanks for your work on this! I had the opportunity to review this merge proposal today. This is a pretty straightforward modification, and I'm happy to see this issue fixed. You have my +1.

Thanks again!

review: Approve

[lp:~paulgear/charms/trusty/ntp/fix-trusty-exceptions-psutil-1.2.x]

22. By Paul Gear on 2015-05-30

Change name of check variable to more accurately reflect purpose

[Tim Van Steenburgh (tvansteenburgh)]

+1 LGTM, thanks Paul!

review: Approve

=== modified file 'files/nagios/check_ntpmon.py'
--- files/nagios/check_ntpmon.py	2015-04-27 13:24:11 +0000
+++ files/nagios/check_ntpmon.py	2015-05-30 22:50:13 +0000
@@ -422,10 +422,13 @@
         """Look for ntpd or xntpd in the process table and save its process object."""
         if names is None:
             names = ["ntpd", "xntpd"]
+        # Check for old psutil per http://grodola.blogspot.com.au/2014/01/psutil-20-porting.html
+        self.PSUTIL2 = psutil.version_info >= (2, 0)
         self.proc = None
         for proc in psutil.process_iter():
             try:
-                if proc.name() in names:
+                name = proc.name() if self.PSUTIL2 else proc.name
+                if name in names:
                     self.proc = proc
                     break
             except psutil.Error:
@@ -438,7 +441,8 @@
             return -1
         try:
             now = time.time()
-            start = int(self.proc.create_time())
+            create_time = self.proc.create_time() if self.PSUTIL2 else self.proc.create_time
+            start = int(create_time)
             return now - start
         except psutil.Error:
             return -1
@@ -541,4 +545,3 @@
 
 if __name__ == "__main__":
     main()
-