[svn-commits] mjordan: testsuite/asterisk/trunk r3173 - /asterisk/trunk/lib/python/asterisk/

[SVN commits to the Digium repositories]

Author: mjordan
Date: Wed Apr 11 21:13:51 2012
New Revision: 3173

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=3173
Log:
Add additional debug for failure of core wait fullybooted

This is to debug failures on the 32-bit CentOS 6 build agent

Modified:
    asterisk/trunk/lib/python/asterisk/asterisk.py

Modified: asterisk/trunk/lib/python/asterisk/asterisk.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/lib/python/asterisk/asterisk.py?view=diff&rev=3173&r1=3172&r2=3173
==============================================================================
--- asterisk/trunk/lib/python/asterisk/asterisk.py (original)
+++ asterisk/trunk/lib/python/asterisk/asterisk.py Wed Apr 11 21:13:51 2012
@@ -4,7 +4,7 @@
 This module provides an interface for creating instances of Asterisk
 from within python code.
 
-Copyright (C) 2010, Digium, Inc.
+Copyright (C) 2010-2012, Digium, Inc.
 Russell Bryant <russell at digium.com>
 
 This program is free software, distributed under the terms of
@@ -43,8 +43,9 @@
         the location of the Asterisk executable; each subsequent argument should define
         the CLI command to run and the instance of Asterisk to run it against.
         """
-        self.__host = host
+        self.host = host
         self.__cmd = cmd
+        self.cli_cmd = cmd[4]
         self.exitcode = -1
         self.output = ""
         self.err = ""
@@ -58,7 +59,7 @@
         def __cli_output_callback(result):
             """ Callback from getProcessOutputAndValue """
             self.__set_properties(result)
-            logger.debug("Asterisk CLI %s exited %d" % (self.__host, self.exitcode))
+            logger.debug("Asterisk CLI %s exited %d" % (self.host, self.exitcode))
             if self.exitcode:
                 self.__deferred.errback(self)
             else:
@@ -67,7 +68,7 @@
         def __cli_error_callback(result):
             """ Errback from getProcessOutputAndValue """
             self.__set_properties(result)
-            logger.warning("Asterisk CLI %s exited %d with error: %s" % (self.__host, self.exitcode, self.err))
+            logger.warning("Asterisk CLI %s exited %d with error: %s" % (self.host, self.exitcode, self.err))
             self.__deferred.errback(self)
 
         self.__deferred = defer.Deferred()
@@ -240,6 +241,7 @@
                 logger.error("Asterisk core waitfullybooted for %s failed" % self.host)
                 self.__start_deferred.errback("Command core waitfullybooted failed")
             else:
+                logger.debug(cli_command.output)
                 logger.debug("Asterisk core waitfullybooted failed, attempting again...")
                 cli_deferred = self.cli_exec("core waitfullybooted")
                 cli_deferred.addCallbacks(__wait_fully_booted_callback, __wait_fully_booted_error)