From owner-svn-src-projects@FreeBSD.ORG Mon Jul 18 01:09:43 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DEEA4106564A; Mon, 18 Jul 2011 01:09:43 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B5A8F8FC13; Mon, 18 Jul 2011 01:09:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6I19hWT098847; Mon, 18 Jul 2011 01:09:43 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6I19hkY098845; Mon, 18 Jul 2011 01:09:43 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201107180109.p6I19hkY098845@svn.freebsd.org> From: Mark Linimon Date: Mon, 18 Jul 2011 01:09:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r224168 - projects/portbuild/qmanager X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jul 2011 01:09:44 -0000 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 )