summaryrefslogtreecommitdiffstats
path: root/src/rgw
diff options
context:
space:
mode:
authorSage Weil <sage@redhat.com>2015-09-16 00:05:59 +0200
committerSage Weil <sage@redhat.com>2015-09-16 00:05:59 +0200
commitc1b28591a2ba55abd644186938d440fc90743f15 (patch)
tree6cd4bcc96f524bc75e5d2523a4dce89460895771 /src/rgw
parentMerge remote-tracking branch 'gh/infernalis' (diff)
downloadceph-c1b28591a2ba55abd644186938d440fc90743f15.tar.xz
ceph-c1b28591a2ba55abd644186938d440fc90743f15.zip
radosgw: log to /var/log/ceph instead of /var/log/radosgw
This is simpler. Signed-off-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'src/rgw')
-rw-r--r--src/rgw/Makefile.am1
-rw-r--r--src/rgw/logrotate.conf12
-rw-r--r--src/rgw/rgw_main.cc1
3 files changed, 0 insertions, 14 deletions
diff --git a/src/rgw/Makefile.am b/src/rgw/Makefile.am
index 9e330a1cdb0..3a30156c298 100644
--- a/src/rgw/Makefile.am
+++ b/src/rgw/Makefile.am
@@ -124,7 +124,6 @@ bin_DEBUGPROGRAMS += ceph_rgw_jsonparser
noinst_HEADERS += \
- rgw/logrotate.conf \
rgw/rgw_acl.h \
rgw/rgw_acl_s3.h \
rgw/rgw_acl_swift.h \
diff --git a/src/rgw/logrotate.conf b/src/rgw/logrotate.conf
deleted file mode 100644
index 036b85bc3b8..00000000000
--- a/src/rgw/logrotate.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-/var/log/radosgw/*.log {
- rotate 7
- daily
- compress
- sharedscripts
- postrotate
- killall -q -1 radosgw || true
- endscript
- missingok
- notifempty
- su ceph ceph
-}
diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index 7a9b32793b1..c6ba1c210fb 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -1028,7 +1028,6 @@ int main(int argc, const char **argv)
vector<const char *> def_args;
def_args.push_back("--debug-rgw=1/5");
def_args.push_back("--keyring=$rgw_data/keyring");
- def_args.push_back("--log-file=/var/log/radosgw/$cluster-$name.log");
vector<const char*> args;
argv_to_vec(argc, argv, args);