Date: Mon, 1 Aug 2011 02:57:01 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r224558 - projects/portbuild/qmanager Message-ID: <201108010257.p712v1At073931@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon (doc,ports committer) Date: Mon Aug 1 02:57:01 2011 New Revision: 224558 URL: http://svn.freebsd.org/changeset/base/224558 Log: Make the error handling tell us more about the exceptions, if any. Modified: projects/portbuild/qmanager/qmanagerclient.py Modified: projects/portbuild/qmanager/qmanagerclient.py ============================================================================== --- projects/portbuild/qmanager/qmanagerclient.py Mon Aug 1 02:56:02 2011 (r224557) +++ projects/portbuild/qmanager/qmanagerclient.py Mon Aug 1 02:57:01 2011 (r224558) @@ -300,12 +300,12 @@ class QManagerClientConn(QManagerConnect return s except Exception, e: if self.stderr: - self.stderr.write("QManagerClientConn: exception in s.makefile(): " + str( e ) + "\n") + self.stderr.write("\nQManagerClientConn: exception in s.makefile(): " + str( e ) + "\n") self.stderr.write(str( path ) + "\n") self.stderr.flush() except Exception, e: if self.stderr: - self.stderr.write("QManagerClientConn: exception in s.connect(): " + str( e ) + "\n") + self.stderr.write("\nQManagerClientConn: exception in s.connect(): " + str( e ) + "\n") self.stderr.write(str( path ) + "\n") self.stderr.flush() try: @@ -314,7 +314,7 @@ class QManagerClientConn(QManagerConnect pass else: if self.stderr: - self.stderr.write("QManagerClientConn: qmanager socket file does not exist!\n") + self.stderr.write("\nQManagerClientConn: qmanager socket file does not exist!\n") self.stderr.flush() return None @@ -333,8 +333,9 @@ class QManagerClientConn(QManagerConnect while True: try: return self.CS.send(self.sockfile, cmd, vars) - except: + except Exception, e: if self.stderr: + self.stderr.write("\nQManagerClientConn: exception in self.SC.send(): " + str( e ) + "\n") self.stderr.write("Error sending command...\n") self.stderr.flush() sleep(timeout) @@ -349,8 +350,9 @@ class QManagerClientConn(QManagerConnect while True: try: return self.SC.receive(self.sockfile) - except: + except Exception, e: if self.stderr: + self.stderr.write("\nQManagerClientConn: exception in self.SC.receive(): " + str( e ) + "\n") self.stderr.write("Error receiving command...\n") self.stderr.flush() sleep(timeout) @@ -394,7 +396,7 @@ class QManagerClientConn(QManagerConnect if self.connect(): break else: - self.stderr.write("Error connecting to qmanager...\n") + self.stderr.write("\nQManagerClientConn: error connecting to qmanager in command()...\n") self.stderr.flush() sleep(timeout) if timeout < 64:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108010257.p712v1At073931>