From owner-svn-src-projects@FreeBSD.ORG  Mon Aug  1 02:57:47 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 178741065675;
	Mon,  1 Aug 2011 02:57:47 +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 076C78FC15;
	Mon,  1 Aug 2011 02:57:47 +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 p712vkgm073991;
	Mon, 1 Aug 2011 02:57:46 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p712vkf5073989;
	Mon, 1 Aug 2011 02:57:46 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201108010257.p712vkf5073989@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Mon, 1 Aug 2011 02:57:46 +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: r224559 - 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 &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Aug 2011 02:57:47 -0000

Author: linimon (doc,ports committer)
Date: Mon Aug  1 02:57:46 2011
New Revision: 224559
URL: http://svn.freebsd.org/changeset/base/224559

Log:
  Split the debug stuff into two knobs.

Modified:
  projects/portbuild/qmanager/packagebuild

Modified: projects/portbuild/qmanager/packagebuild
==============================================================================
--- projects/portbuild/qmanager/packagebuild	Mon Aug  1 02:57:01 2011	(r224558)
+++ projects/portbuild/qmanager/packagebuild	Mon Aug  1 02:57:46 2011	(r224559)
@@ -65,7 +65,8 @@ QMANAGER_RUNAWAY_PERCENTAGE = float( \
 QMANAGER_RUNAWAY_THRESHOLD  = int( \
     config.get( 'QMANAGER_RUNAWAY_THRESHOLD' ) )
 
-DEBUG = False
+DEBUG_PACKAGEBUILD = False
+DEBUG_RETCODE = False
 
 categories = {}
 ports = {}
@@ -480,7 +481,7 @@ class worker(threading.Thread):
         except RequestError, e:
             print "[MASTER] Error releasing job %s (%s): %s" % (pkg.name, pkg.id, e.value)
 
-        if DEBUG:
+        if DEBUG_RETCODE:
             print "[MASTER] got retcode %d from pkg %s" % (retcode, pkg.name)
         if retcode == 254:
             # Requeue soft failure at original priority
@@ -578,7 +579,7 @@ def main(arch, branch, buildid, args):
             print "[MASTER] Remaining ports: %s" % ports.keys()
 
         (prio, job) = queue.get()
-        if DEBUG:
+        if DEBUG_PACKAGEBUILD:
             print "[MASTER] Job %s pulled from queue with prio %d" % ( job.name, prio )
         if prio == SUCCESS_PRIO:
             print "[MASTER] Job %s succeeded" % job.name
@@ -595,7 +596,7 @@ def main(arch, branch, buildid, args):
                 # XXX MCL 20110421
                 completed_jobs = completed_jobs + 1
                 failed_jobs    = failed_jobs + 1
-                if DEBUG:
+                if DEBUG_PACKAGEBUILD:
                     print "[MASTER] jobs: %d failed jobs out of %d:" % \
                         ( failed_jobs, completed_jobs )
                 if completed_jobs > QMANAGER_RUNAWAY_THRESHOLD and \