Merge "Don't use instances of complex types as a default value in args"
diff --git a/jeepyb/cmd/close_pull_requests.py b/jeepyb/cmd/close_pull_requests.py
index 720fa10..232291e 100644
--- a/jeepyb/cmd/close_pull_requests.py
+++ b/jeepyb/cmd/close_pull_requests.py
@@ -57,7 +57,8 @@
def main():
logging.basicConfig(level=logging.ERROR,
- format='%(asctime)-6s: %(name)s - %(levelname)s')
+ format='%(asctime)-6s: %(name)s - %(levelname)s'
+ ' - %(message)s')
GITHUB_SECURE_CONFIG = os.environ.get('GITHUB_SECURE_CONFIG',
'/etc/github/github.secure.config')
diff --git a/jeepyb/cmd/manage_projects.py b/jeepyb/cmd/manage_projects.py
index 1de6147..1dc6578 100644
--- a/jeepyb/cmd/manage_projects.py
+++ b/jeepyb/cmd/manage_projects.py
@@ -535,13 +535,16 @@
if args.debug:
logging.basicConfig(level=logging.DEBUG,
- format='%(asctime)-6s: %(name)s - %(levelname)s')
+ format='%(asctime)-6s: %(name)s - %(levelname)s'
+ ' - %(message)s')
elif args.verbose:
logging.basicConfig(level=logging.INFO,
- format='%(asctime)-6s: %(name)s - %(levelname)s')
+ format='%(asctime)-6s: %(name)s - %(levelname)s'
+ ' - %(message)s')
else:
logging.basicConfig(level=logging.ERROR,
- format='%(asctime)-6s: %(name)s - %(levelname)s')
+ format='%(asctime)-6s: %(name)s - %(levelname)s'
+ ' - %(message)s')
default_has_github = registry.get_defaults('has-github', True)
diff --git a/jeepyb/cmd/welcome_message.py b/jeepyb/cmd/welcome_message.py
index cf525a8..456c4ea 100644
--- a/jeepyb/cmd/welcome_message.py
+++ b/jeepyb/cmd/welcome_message.py
@@ -157,10 +157,12 @@
if args.verbose:
logging.basicConfig(level=logging.DEBUG,
- format='%(asctime)-6s: %(name)s - %(levelname)s')
+ format='%(asctime)-6s: %(name)s - %(levelname)s'
+ ' - %(message)s')
else:
logging.basicConfig(level=logging.ERROR,
- format='%(asctime)-6s: %(name)s - %(levelname)s')
+ format='%(asctime)-6s: %(name)s - %(levelname)s'
+ ' - %(message)s')
# they're a first-timer, post the message on 1st patchset
if is_newbie(args.uploader) and args.patchset == '1' and not args.dryrun: