summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Benjamin <mbenjamin@redhat.com>2016-02-17 16:46:21 +0100
committerMatt Benjamin <mbenjamin@redhat.com>2016-02-17 16:46:21 +0100
commitebfc6bfd10b271a621e5fe286ef526ff5a9beaed (patch)
tree32b9fbd36a561c4e66373e1967e2dcb678f9c557
parentMerge pull request #7603 from roidayan/xio_fixes (diff)
downloadceph-ebfc6bfd10b271a621e5fe286ef526ff5a9beaed.tar.xz
ceph-ebfc6bfd10b271a621e5fe286ef526ff5a9beaed.zip
rgw: move signal.h dependency from rgw_front.h
Missed in refactoring of rgw_main.cc. Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
-rw-r--r--src/rgw/rgw_frontend.cc9
-rw-r--r--src/rgw/rgw_frontend.h5
2 files changed, 9 insertions, 5 deletions
diff --git a/src/rgw/rgw_frontend.cc b/src/rgw/rgw_frontend.cc
index 7c25095bc1f..24e186e2d46 100644
--- a/src/rgw/rgw_frontend.cc
+++ b/src/rgw/rgw_frontend.cc
@@ -1,8 +1,9 @@
// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
// vim: ts=8 sw=2 smarttab
-#include "rgw_frontend.h"
+#include <signal.h>
+#include "rgw_frontend.h"
#include "include/str_list.h"
#include "include/assert.h"
@@ -77,3 +78,9 @@ bool RGWFrontendConfig::get_val(const string& key, int def_val, int *out)
}
return 0;
}
+
+void RGWProcessFrontend::stop()
+{
+ pprocess->close_fd();
+ thread->kill(SIGUSR1);
+}
diff --git a/src/rgw/rgw_frontend.h b/src/rgw/rgw_frontend.h
index 836e1e7632a..11497d4b0d0 100644
--- a/src/rgw/rgw_frontend.h
+++ b/src/rgw/rgw_frontend.h
@@ -102,10 +102,7 @@ public:
return 0;
}
- void stop() {
- pprocess->close_fd();
- thread->kill(SIGUSR1);
- }
+ void stop();
void join() {
thread->join();