[asterisk-commits] mjordan: branch mjordan/voicemail_tests_082811 r2014 - in /asterisk/team/mjor...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Aug 29 12:56:27 CDT 2011
Author: mjordan
Date: Mon Aug 29 12:56:24 2011
New Revision: 2014
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=2014
Log:
Pulled in basic changes from trunk
Modified:
asterisk/team/mjordan/voicemail_tests_082811/lib/python/asterisk/TestCase.py
asterisk/team/mjordan/voicemail_tests_082811/lib/python/asterisk/voicemail.py
asterisk/team/mjordan/voicemail_tests_082811/logger.conf
Modified: asterisk/team/mjordan/voicemail_tests_082811/lib/python/asterisk/TestCase.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mjordan/voicemail_tests_082811/lib/python/asterisk/TestCase.py?view=diff&rev=2014&r1=2013&r2=2014
==============================================================================
--- asterisk/team/mjordan/voicemail_tests_082811/lib/python/asterisk/TestCase.py (original)
+++ asterisk/team/mjordan/voicemail_tests_082811/lib/python/asterisk/TestCase.py Mon Aug 29 12:56:24 2011
@@ -8,7 +8,8 @@
'''
import sys
-import logging, logging.config
+import logging
+import logging.config
import os
from twisted.internet import reactor
from starpy import manager, fastagi
@@ -40,7 +41,7 @@
print "WARNING: no logging.conf file found; using default configuration"
logging.basicConfig(level=self.defaultLogLevel)
- logger.info("Executing " + self.test_name + "...")
+ logger.info("Executing " + self.test_name)
reactor.callWhenRunning(self.run)
def create_asterisk(self, count=1):
@@ -51,7 +52,7 @@
"""
for c in range(count):
- logger.info("Creating Asterisk instance %d ..." % (c + 1))
+ logger.info("Creating Asterisk instance %d" % (c + 1))
self.ast.append(Asterisk(base=self.base))
# Copy shared config files
self.ast[c].install_configs("%s/configs" %
@@ -73,7 +74,7 @@
for c in range(count):
host = "127.0.0.%d" % (c + 1)
self.ami.append(None)
- logger.info( "Creating AMIFactory %d ..." % (c + 1))
+ logger.info("Creating AMIFactory %d" % (c + 1))
self.ami_factory = manager.AMIFactory(username, secret, c)
self.ami_factory.login(host).addCallbacks(self.ami_connect,
self.ami_login_error)
@@ -83,7 +84,7 @@
for c in range(count):
host = "127.0.0.%d" % (c + 1)
self.fastagi.append(None)
- logger.info( "Creating FastAGI Factory %d ..." % (c + 1))
+ logger.info("Creating FastAGI Factory %d" % (c + 1))
self.fastagi_factory = fastagi.FastAGIFactory(self.fastagi_connect)
reactor.listenTCP(4573, self.fastagi_factory,
self.reactor_timeout, host)
@@ -93,7 +94,7 @@
"""
for index, item in enumerate(self.ast):
- logger.info( "Starting Asterisk instance %d ..." % (index + 1))
+ logger.info("Starting Asterisk instance %d" % (index + 1))
self.ast[index].start()
def stop_asterisk(self):
@@ -101,14 +102,14 @@
"""
for index, item in enumerate(self.ast):
- logger.info( "Stopping Asterisk instance %d ..." % (index + 1))
+ logger.info("Stopping Asterisk instance %d" % (index + 1))
self.ast[index].stop()
def stop_reactor(self):
"""
"""
- logger.info( "Stopping Reactor ...")
+ logger.info("Stopping Reactor")
if reactor.running:
reactor.stop()
@@ -119,10 +120,10 @@
reactor.callLater(self.reactor_timeout, self.stop_reactor)
def ami_login_error(self, ami):
- logger.error( "Error logging into AMI")
+ logger.error("Error logging into AMI")
self.stop_reactor()
def ami_connect(self, ami):
- logger.info( "AMI Connect instance %s ..." % (ami.id + 1))
+ logger.info("AMI Connect instance %s" % (ami.id + 1))
self.ami[ami.id] = ami
Modified: asterisk/team/mjordan/voicemail_tests_082811/lib/python/asterisk/voicemail.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mjordan/voicemail_tests_082811/lib/python/asterisk/voicemail.py?view=diff&rev=2014&r1=2013&r2=2014
==============================================================================
--- asterisk/team/mjordan/voicemail_tests_082811/lib/python/asterisk/voicemail.py (original)
+++ asterisk/team/mjordan/voicemail_tests_082811/lib/python/asterisk/voicemail.py Mon Aug 29 12:56:24 2011
@@ -14,7 +14,6 @@
import shutil
import logging
-from datetime import datetime
from asterisk import Asterisk
from config import Category
from config import ConfigFile
Modified: asterisk/team/mjordan/voicemail_tests_082811/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mjordan/voicemail_tests_082811/logger.conf?view=diff&rev=2014&r1=2013&r2=2014
==============================================================================
--- asterisk/team/mjordan/voicemail_tests_082811/logger.conf (original)
+++ asterisk/team/mjordan/voicemail_tests_082811/logger.conf Mon Aug 29 12:56:24 2011
@@ -11,7 +11,7 @@
[formatters]
keys=default
-# Logger definitions. If additional logging handlers are desired,
+# Logger definitions. If additional logging handlers are desired,
# they can be configured below this section.
[logger_root]
level=NOTSET
@@ -45,15 +45,15 @@
class=handlers.RotatingFileHandler
level=INFO
formatter=default
-args=('./logs/messages.log', 'a', 67108864, 5)
-
+args=('./logs/messages', 'a', 67108864, 5)
[handler_verboseFile]
class=handlers.RotatingFileHandler
level=DEBUG
formatter=default
-args=('./logs/full.log', 'a', 67108864, 10)
+args=('./logs/full', 'a', 67108864, 10)
# Formatter definitions for handlers defined in this configuration file
[formatter_default]
-format='%(levelname)s %(asctime)s %(name)s::%(funcName)s[%(lineno)d]: %(message)s'
+format=[%(asctime)s] %(levelname)s[%(process)d]: %(name)s:%(lineno)d %(funcName)s: %(message)s
+datefmt=%b %d %H:%M:%S
class=logging.Formatter
More information about the asterisk-commits
mailing list