diff options
author | Sage Weil <sage@inktank.com> | 2013-08-23 15:30:41 -0700 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-08-23 15:30:41 -0700 |
commit | 4b529c8bceea98aaf69dceec3a4d1a239036d5d7 (patch) | |
tree | f77c5116d20f22af3b3a4f09136b0604a66c952c | |
parent | 057588f41af39460f46f36594ac1c5c962068289 (diff) | |
parent | 2031f391c3df68e0d9e381a1ef3fe58d8939f0a8 (diff) | |
download | ceph-4b529c8bceea98aaf69dceec3a4d1a239036d5d7.tar.gz |
Merge pull request #531 from dmick/wip-6099
ceph_rest_api.py: create own default for log_file
Reviewed-by: Sage Weil <sage@inktank.com>
-rwxr-xr-x | src/pybind/ceph_rest_api.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/pybind/ceph_rest_api.py b/src/pybind/ceph_rest_api.py index 421cc59edcc..c53c3d77737 100755 --- a/src/pybind/ceph_rest_api.py +++ b/src/pybind/ceph_rest_api.py @@ -5,6 +5,7 @@ import errno import json import logging import logging.handlers +import os import rados import textwrap import xml.etree.ElementTree @@ -26,6 +27,7 @@ DEFAULT_ID = 'restapi' DEFAULT_BASEURL = '/api/v0.1' DEFAULT_LOG_LEVEL = 'warning' +DEFAULT_LOGDIR = '/var/log/ceph' # default client name will be 'client.<DEFAULT_ID>' # 'app' must be global for decorators, etc. @@ -117,7 +119,18 @@ def api_setup(app, conf, cluster, clientname, clientid, args): loglevel = app.ceph_cluster.conf_get('restapi_log_level') \ or DEFAULT_LOG_LEVEL + # ceph has a default log file for daemons only; clients (like this) + # default to "". Override that for this particular client. logfile = app.ceph_cluster.conf_get('log_file') + if not logfile: + logfile = os.path.join( + DEFAULT_LOGDIR, + '{cluster}-{clientname}.{pid}.log'.format( + cluster=cluster, + clientname=clientname, + pid=os.getpid() + ) + ) app.logger.addHandler(logging.handlers.WatchedFileHandler(logfile)) app.logger.setLevel(LOGLEVELS[loglevel.lower()]) for h in app.logger.handlers: |