diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-10 08:59:58 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-10 08:59:58 +0200 |
| commit | 3a2c0aabc66ff393a038c639fc2aa094f277ec5b (patch) | |
| tree | 388766e52a16203e00572c235f062a3a4c28d7f1 /cpp/src | |
| parent | More fixes (diff) | |
| download | ice-3a2c0aabc66ff393a038c639fc2aa094f277ec5b.tar.bz2 ice-3a2c0aabc66ff393a038c639fc2aa094f277ec5b.tar.xz ice-3a2c0aabc66ff393a038c639fc2aa094f277ec5b.zip | |
Fixes
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/MetricsAdminI.cpp | 8 | ||||
| -rw-r--r-- | cpp/src/Ice/MetricsAdminI.h | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/cpp/src/Ice/MetricsAdminI.cpp b/cpp/src/Ice/MetricsAdminI.cpp index ed7f5aa9049..16bc951e648 100644 --- a/cpp/src/Ice/MetricsAdminI.cpp +++ b/cpp/src/Ice/MetricsAdminI.cpp @@ -293,7 +293,7 @@ MetricsAdminI::addFactory(const string& mapName, const MetricsMapFactoryPtr& fac // // Add maps to views configured with the given map. // - const string viewsPrefix = "IceMX.MetricsView."; + const string viewsPrefix = "IceMX.Metrics."; PropertyDict views = _properties->getPropertiesForPrefix(viewsPrefix); for(PropertyDict::const_iterator p = views.begin(); p != views.end(); ++p) { @@ -307,14 +307,14 @@ MetricsAdminI::addFactory(const string& mapName, const MetricsMapFactoryPtr& fac map<string, MetricsViewIPtr>::const_iterator q = _views.find(viewName); if(q == _views.end()) { - bool enabled = _properties->getPropertyAsIntWithDefault(viewsPrefix + viewName, 1) > 0; - q = _views.insert(make_pair(viewName, new MetricsViewI(enabled))).first; + bool disabled = _properties->getPropertyAsIntWithDefault(viewsPrefix + viewName + ".Disabled", 0) > 0; + q = _views.insert(make_pair(viewName, new MetricsViewI(disabled))).first; } MetricsViewIPtr view = q->second; const string mapsPrefix = viewsPrefix + viewName + ".Map."; string mapPrefix = mapsPrefix + mapName; - if(_properties->getPropertyAsInt(mapPrefix) == 0 || _properties->getPropertiesForPrefix(mapPrefix).empty()) + if(_properties->getPropertiesForPrefix(mapPrefix).empty()) { if(_properties->getPropertiesForPrefix(mapsPrefix).empty()) { diff --git a/cpp/src/Ice/MetricsAdminI.h b/cpp/src/Ice/MetricsAdminI.h index f2001a5ecaa..a3542a33070 100644 --- a/cpp/src/Ice/MetricsAdminI.h +++ b/cpp/src/Ice/MetricsAdminI.h @@ -231,8 +231,7 @@ public: { const std::string subMapsPrefix = mapPrefix + ".Map."; std::string subMapPrefix = subMapsPrefix + p->first; - if(properties->getPropertyAsInt(subMapPrefix) == 0 || - properties->getPropertiesForPrefix(subMapPrefix).empty()) + if(properties->getPropertiesForPrefix(subMapPrefix).empty()) { if(properties->getPropertiesForPrefix(subMapsPrefix).empty()) { |