Skip to content

Commit

Permalink
Merge pull request #10549 from stiopaa1/mon_healthmonitor_addOverride
Browse files Browse the repository at this point in the history
mon/HealthMonitor: add override to virtual functs

Reviewed-by: Sage Weil <sage@redhat.com>
  • Loading branch information
liewegas committed Sep 18, 2016
2 parents 1842b85 + a2786cd commit cc56a5f
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions src/mon/HealthMonitor.h
Expand Up @@ -25,7 +25,7 @@ class HealthMonitor : public QuorumService
map<int,HealthService*> services;

protected:
virtual void service_shutdown();
void service_shutdown() override;

public:
HealthMonitor(Monitor *m) : QuorumService(m) { }
Expand All @@ -38,20 +38,20 @@ class HealthMonitor : public QuorumService
* @defgroup HealthMonitor_Inherited_h Inherited abstract methods
* @{
*/
virtual void init();
virtual void get_health(Formatter *f,
list<pair<health_status_t,string> >& summary,
list<pair<health_status_t,string> > *detail);
virtual bool service_dispatch(MonOpRequestRef op);
void init() override;
void get_health(Formatter *f,
list<pair<health_status_t,string> >& summary,
list<pair<health_status_t,string> > *detail) override;
bool service_dispatch(MonOpRequestRef op) override;

virtual void start_epoch() {
void start_epoch() override {
for (map<int,HealthService*>::iterator it = services.begin();
it != services.end(); ++it) {
it->second->start(get_epoch());
}
}

virtual void finish_epoch() {
void finish_epoch() override {
generic_dout(20) << "HealthMonitor::finish_epoch()" << dendl;
for (map<int,HealthService*>::iterator it = services.begin();
it != services.end(); ++it) {
Expand All @@ -60,14 +60,14 @@ class HealthMonitor : public QuorumService
}
}

virtual void cleanup() { }
virtual void service_tick() { }
void cleanup() override { }
void service_tick() override { }

virtual int get_type() {
int get_type() override {
return QuorumService::SERVICE_HEALTH;
}

virtual string get_name() const {
string get_name() const override {
return "health";
}

Expand Down

0 comments on commit cc56a5f

Please sign in to comment.