[CalendarServer-changes] [10944] CalendarServer/trunk/calendarserver/accesslog.py

[source_changes at macosforge.org]

Revision: 10944
          http://trac.calendarserver.org//changeset/10944
Author:   wsanchez at apple.com
Date:     2013-03-18 12:57:28 -0700 (Mon, 18 Mar 2013)
Log Message:
-----------
Don't call psutil.virtual_memory() on FreeBSD, as it seems to be crazy
expensive there.

Fixes #800
Fixed by Axel.Rau at Chaos1.DE

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/accesslog.py

Modified: CalendarServer/trunk/calendarserver/accesslog.py
===================================================================
--- CalendarServer/trunk/calendarserver/accesslog.py	2013-03-18 19:53:51 UTC (rev 10943)
+++ CalendarServer/trunk/calendarserver/accesslog.py	2013-03-18 19:57:28 UTC (rev 10944)
@@ -33,6 +33,7 @@
     import psutil
 except ImportError:
     psutil = None
+from sys import platform
 import time
 
 from calendarserver.logAnalysis import getAdjustedMethodName, \
@@ -627,7 +628,7 @@
             self.previous_cpu = cpu_now
 
         # Memory usage
-        if psutil is not None:
+        if psutil is not None and 'freebsd' not in platform:
             mem = psutil.virtual_memory()
             self.items["memory used"] = mem.used
             self.items["memory percent"] = mem.percent
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130318/cd436c1b/attachment-0001.html>