Date: Mon, 18 Jul 2011 01:09:43 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r224168 - projects/portbuild/qmanager Message-ID: <201107180109.p6I19hkY098845@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon (doc,ports committer) Date: Mon Jul 18 01:09:43 2011 New Revision: 224168 URL: http://svn.freebsd.org/changeset/base/224168 Log: Add some debugging (disabled by default). Modified: projects/portbuild/qmanager/qmanagerhandler.py Modified: projects/portbuild/qmanager/qmanagerhandler.py ============================================================================== --- projects/portbuild/qmanager/qmanagerhandler.py Mon Jul 18 01:07:49 2011 (r224167) +++ projects/portbuild/qmanager/qmanagerhandler.py Mon Jul 18 01:09:43 2011 (r224168) @@ -4,6 +4,8 @@ import SocketServer, threading, freebsd, from qmanagerclient import * from acl import * +DEBUG=False + class ServerReplyException(Exception): pass @@ -138,8 +140,14 @@ class UNIXhandler(SocketServer.StreamReq conn = QManagerServerConn(self.rfile, self.wfile, self.event) try: + if DEBUG: + print "at UNIXhandler.handle()" (conn.cmd, conn.args) = conn.receive() + if DEBUG: + print "past conn.receive() for " + conn.cmd + " and " + str( conn.args ) (conn.uid, conn.gids) = freebsd.getpeerid(self.request) + if DEBUG: + print "past freebsd.getpeerid" if conn.uid == 0: # Allow root to override uid/gids, when proxying for a user try: @@ -150,9 +158,15 @@ class UNIXhandler(SocketServer.StreamReq conn.gids = tuple(getgidbyname(gid) for gid in conn.args['gids'].split(",")) except KeyError, TypeError: pass - except: + except Exception, e: + if DEBUG: + print "UNIXhandler.handle(): exception: " + str( e ) conn.send(401) # XXX other errors too return self.server.wqueue.put(conn) + if DEBUG: + print "past wqueue.put() for " + conn.cmd + " and " + str( conn.args ) self.event.wait() # Don't close socket until the command finishes + if DEBUG: + print "past event.wait() for " + conn.cmd + " and " + str( conn.args )
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107180109.p6I19hkY098845>