# HG changeset patch # User cmlenz # Date 1186578572 0 # Node ID ab2557ff0d978dbd07c40358d6f71623e71fc638 # Parent ff35be7d2a5ec59dcd5787244e9537792d953599 Change the default log verbosity of the build slave, and remove the `--debug` option. diff --git a/bitten/slave.py b/bitten/slave.py --- a/bitten/slave.py +++ b/bitten/slave.py @@ -99,7 +99,7 @@ return self.opener.open(req) except urllib2.HTTPError, e: if e.code >= 300: - log.warn('Server returned error %d: %s', e.code, e.msg) + log.warning('Server returned error %d: %s', e.code, e.msg) raise return e @@ -180,7 +180,7 @@ log.warning('Stopping build due to failure') break else: - log.warning('Build completed') + log.info('Build completed') finally: if not self.keep_files: log.debug('Removing build directory %s' % basedir) @@ -203,7 +203,7 @@ output ]) except KeyboardInterrupt: - log.warn('Build interrupted') + log.warning('Build interrupted') raise ExitSlave() except BuildError, e: log.error('Build step %r failed (%s)', step.id, e) @@ -255,12 +255,10 @@ help='write log messages to FILENAME') parser.add_option('-n', '--dry-run', action='store_true', dest='dry_run', help='don\'t report results back to master') - parser.add_option('--debug', action='store_const', dest='loglevel', - const=logging.DEBUG, help='enable debugging output') parser.add_option('-v', '--verbose', action='store_const', dest='loglevel', - const=logging.INFO, help='print as much as possible') + const=logging.DEBUG, help='print as much as possible') parser.add_option('-q', '--quiet', action='store_const', dest='loglevel', - const=logging.ERROR, help='print as little as possible') + const=logging.WARN, help='print as little as possible') parser.add_option('-s', '--single', action='store_true', dest='single_build', help='exit after completing a single build') @@ -269,7 +267,7 @@ parser.add_option('-p', '--password', dest='password', help='the password to use when authenticating') parser.set_defaults(dry_run=False, keep_files=False, - loglevel=logging.WARNING, single_build=False) + loglevel=logging.INFO, single_build=False) options, args = parser.parse_args() if len(args) < 1: