Revision: 4296 http://trac.macosforge.org/projects/calendarserver/changeset/4296 Author: sagen@apple.com Date: 2009-05-19 14:02:35 -0700 (Tue, 19 May 2009) Log Message: ----------- Lower wiki-related logging levels Modified Paths: -------------- CalendarServer/trunk/calendarserver/provision/root.py CalendarServer/trunk/twistedcaldav/directory/wiki.py Modified: CalendarServer/trunk/calendarserver/provision/root.py =================================================================== --- CalendarServer/trunk/calendarserver/provision/root.py 2009-05-19 19:22:10 UTC (rev 4295) +++ CalendarServer/trunk/calendarserver/provision/root.py 2009-05-19 21:02:35 UTC (rev 4296) @@ -174,11 +174,11 @@ token = None if token is not None and token != "unauthenticated": - log.info("Wiki sessionID cookie value: %s" % (token,)) + log.debug("Wiki sessionID cookie value: %s" % (token,)) proxy = Proxy(wikiConfig["URL"]) try: username = (yield proxy.callRemote(wikiConfig["UserMethod"], token)) - log.info("Wiki lookup returned user: %s" % (username,)) + log.debug("Wiki lookup returned user: %s" % (username,)) directory = request.site.resource.getDirectory() record = directory.recordWithShortName("users", username) if record is None: @@ -221,7 +221,7 @@ returnValue(child) except Exception, e: - log.info("Wiki lookup returned ERROR: %s" % (e,)) + log.warn("Wiki lookup returned ERROR: %s" % (e,)) raise HTTPError(StatusResponse( responsecode.FORBIDDEN, "Your sessionID was rejected by the authenticating wiki server." Modified: CalendarServer/trunk/twistedcaldav/directory/wiki.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/wiki.py 2009-05-19 19:22:10 UTC (rev 4295) +++ CalendarServer/trunk/twistedcaldav/directory/wiki.py 2009-05-19 21:02:35 UTC (rev 4296) @@ -165,12 +165,12 @@ proxy = Proxy(wikiConfig["URL"]) try: - log.info("Looking up Wiki ACL for: user [%s], wiki [%s]" % (userID, + log.debug("Looking up Wiki ACL for: user [%s], wiki [%s]" % (userID, wikiID)) access = (yield proxy.callRemote(wikiConfig["WikiMethod"], userID, wikiID)) - log.info("Wiki ACL result: user [%s], wiki [%s], access [%s]" % (userID, + log.debug("Wiki ACL result: user [%s], wiki [%s], access [%s]" % (userID, wikiID, access)) # The ACL we returns has ACEs for the end-user and the wiki principal @@ -253,7 +253,7 @@ except Fault, fault: - log.info("Wiki ACL result: user [%s], wiki [%s], FAULT [%s]" % (userID, + log.debug("Wiki ACL result: user [%s], wiki [%s], FAULT [%s]" % (userID, wikiID, fault)) if fault.faultCode == 2: # non-existent user