]> git-server-git.apps.pok.os.sepia.ceph.com Git - radosgw-agent.git/commitdiff
cli: add a default log file
authorJosh Durgin <josh.durgin@inktank.com>
Wed, 19 Mar 2014 11:31:29 +0000 (04:31 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Sat, 22 Mar 2014 12:14:31 +0000 (05:14 -0700)
Now that the packages include /var/log/ceph/radosgw-agent, default to
storing logs there, named after the configuration file or
radosgw-agent.log if no config file was used.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
radosgw_agent/cli.py

index 48b19e76f027871edc8632b6667fe7a10ed0eaaf..5a81fc239f54026b4918c97964b7494b0a2c6323 100644 (file)
@@ -3,6 +3,7 @@ import argparse
 import contextlib
 import logging
 import logging.handlers
+import os.path
 import yaml
 import sys
 
@@ -32,9 +33,14 @@ def parse_args():
         help='configuration file'
         )
     args, remaining = conf_parser.parse_known_args()
+    log_dir = '/var/log/ceph/radosgw-agent/'
+    log_file = 'radosgw-agent.log'
+    if args.conf is not None:
+        log_file = os.path.basename(args.conf.name)
     defaults = dict(
         sync_scope='incremental',
         log_lock_time=20,
+        log_file=os.path.join(log_dir, log_file),
         )
     if args.conf is not None:
         with contextlib.closing(args.conf):