diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-09-12 13:24:38 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-09-12 13:24:38 +0200 |
| commit | abeebf67ba35156606bbaabf073b496900f836cf (patch) | |
| tree | 430212c34a1a1d4922fa11426e9fbd537fb98e52 /cpp/src/Ice/InstrumentationI.h | |
| parent | Fixed dependencies (diff) | |
| download | ice-abeebf67ba35156606bbaabf073b496900f836cf.tar.bz2 ice-abeebf67ba35156606bbaabf073b496900f836cf.tar.xz ice-abeebf67ba35156606bbaabf073b496900f836cf.zip | |
Fixed ICE-5620: metrics admin creation in IceBox, fixed bug where timer wasn't instrumented
Diffstat (limited to 'cpp/src/Ice/InstrumentationI.h')
| -rw-r--r-- | cpp/src/Ice/InstrumentationI.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cpp/src/Ice/InstrumentationI.h b/cpp/src/Ice/InstrumentationI.h index db515999f23..f1982b765ea 100644 --- a/cpp/src/Ice/InstrumentationI.h +++ b/cpp/src/Ice/InstrumentationI.h @@ -214,9 +214,7 @@ class ICE_API CommunicatorObserverI : public Ice::Instrumentation::CommunicatorO { public: - CommunicatorObserverI(const IceInternal::MetricsAdminIPtr&, - const Ice::Instrumentation::CommunicatorObserverPtr& = - Ice::Instrumentation::CommunicatorObserverPtr()); + CommunicatorObserverI(const Ice::InitializationData&); virtual void setObserverUpdater(const Ice::Instrumentation::ObserverUpdaterPtr&); @@ -241,14 +239,13 @@ public: virtual Ice::Instrumentation::DispatchObserverPtr getDispatchObserver(const Ice::Current&, Ice::Int); - const IceInternal::MetricsAdminIPtr& getMetricsAdmin() const; + const IceInternal::MetricsAdminIPtr& getFacet() const; void destroy(); private: IceInternal::MetricsAdminIPtr _metrics; - Ice::LoggerPtr _logger; const Ice::Instrumentation::CommunicatorObserverPtr _delegate; ObserverFactoryWithDelegateT<ConnectionObserverI> _connections; |