← Back to branch summary

~ubuntu-branches/debian/jessie/ceph/jessie

« back to all changes in this revision

Viewing changes to src/mon/HealthMonitor.cc

  • Committer: Package Import Robot
  • Author(s): Dmitry Smirnov
  • Date: 2014-07-18 02:33:39 UTC
  • mfrom: (1.2.17)
  • Revision ID: package-import@ubuntu.com-20140718023339-03jdyr6dxl2hx00y
Tags: 0.80.4-1
* New upstream release [July 2014].
* New patches:
  + rbdmap1-mount.patch
  + rbdmap2-hooks.patch
  + rbdmap3-lazyumount.patch
  + bug-8821.patch
* radosgw: removed unused lintian overrides.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mon/HealthMonitor.cc
80
80
  services.clear();
81
81
}
82
82
 
83
 
health_status_t HealthMonitor::get_health(Formatter *f,
84
 
                                          list<pair<health_status_t,string> > *detail)
 
83
void HealthMonitor::get_health(Formatter *f,
 
84
                               list<pair<health_status_t,string> >& summary,
 
85
                               list<pair<health_status_t,string> > *detail)
85
86
{
86
 
  health_status_t overall = HEALTH_OK;
87
87
  if (f) {
88
88
    f->open_object_section("health");
89
89
    f->open_array_section("health_services");
92
92
  for (map<int,HealthService*>::iterator it = services.begin();
93
93
       it != services.end();
94
94
       ++it) {
95
 
    health_status_t h = it->second->get_health(f, detail);
96
 
    if (overall > h)
97
 
      overall = h;
 
95
    it->second->get_health(f, summary, detail);
98
96
  }
99
97
 
100
98
  if (f) {
101
99
    f->close_section(); // health_services
102
100
    f->close_section(); // health
103
101
  }
104
 
 
105
 
  return overall;
106
102
}
107
103