[CalendarServer-changes] [8723] CalendarServer/trunk/contrib/tools/protocolanalysis.py

[source_changes at macosforge.org]

Revision: 8723
          http://trac.macosforge.org/projects/calendarserver/changeset/8723
Author:   cdaboo at apple.com
Date:     2012-02-17 09:11:35 -0800 (Fri, 17 Feb 2012)
Log Message:
-----------
Log all user-agent strings (ones not normalized are truncated).

Modified Paths:
--------------
    CalendarServer/trunk/contrib/tools/protocolanalysis.py

Modified: CalendarServer/trunk/contrib/tools/protocolanalysis.py
===================================================================
--- CalendarServer/trunk/contrib/tools/protocolanalysis.py	2012-02-16 19:36:22 UTC (rev 8722)
+++ CalendarServer/trunk/contrib/tools/protocolanalysis.py	2012-02-17 17:11:35 UTC (rev 8723)
@@ -284,7 +284,7 @@
 
         self.currentLine = None
         self.linesRead = 0
-
+        
     def analyzeLogFile(self, logFilePath, ctr):
         fpath = os.path.expanduser(logFilePath)
         if fpath.endswith(".gz"):
@@ -565,21 +565,27 @@
     
     def getClientAdjustedName(self):
     
-        index = self.currentLine.client.find("iCal/")
-        if index != -1:
-            name = self.currentLine.client[index:self.currentLine.client.find(' ', index)]
-            return name
+        versionClients = (
+            "iCal/",
+            "iPhone/",
+            "iOS/",
+            "CalendarAgent",
+            "Calendar/",
+            "CoreDAV/",
+            "Safari/",
+            "dataaccessd",
+            "curl/",
+            "DAVKit",
+        )
+        for client in versionClients:
+            index = self.currentLine.client.find(client)
+            if index != -1:
+                endex = self.currentLine.client.find(' ', index)
+                if endex == -1:
+                    endex = len(self.currentLine.client)
+                name = self.currentLine.client[index:endex]
+                return name
         
-        index = self.currentLine.client.find("iPhone/")
-        if index != -1:
-            name = self.currentLine.client[index:self.currentLine.client.find(' ', index)]
-            return name
-        
-        index = self.currentLine.client.find("iOS/")
-        if index != -1:
-            name = self.currentLine.client[index:self.currentLine.client.find(' ', index)]
-            return name
-        
         index = self.currentLine.client.find("calendarclient")
         if index != -1:
             code = self.currentLine.client[14]
@@ -603,7 +609,7 @@
             if index != -1:
                 return result
 
-        return "Other"
+        return self.currentLine.client[:20]
     
     def getAdjustedMethodName(self):
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120217/90f0d9df/attachment.html>