diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-09-11 13:02:32 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-09-11 13:02:32 +0200 |
| commit | cedcb5c1047b94890c80a2d71afb808898233b9b (patch) | |
| tree | 637b78cd06171738a3300043b0af43b43d17b0dc /cpp/src/Ice/Instance.cpp | |
| parent | Merge remote-tracking branch 'origin/encoding11' into withoutsync (diff) | |
| download | ice-cedcb5c1047b94890c80a2d71afb808898233b9b.tar.bz2 ice-cedcb5c1047b94890c80a2d71afb808898233b9b.tar.xz ice-cedcb5c1047b94890c80a2d71afb808898233b9b.zip | |
Support for IceBox services MetricsAdmin and IceStorm metrics
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index e4f016cd0af..d040ddddab1 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -37,10 +37,9 @@ #include <IceUtil/StringUtil.h> #include <Ice/PropertiesI.h> #include <Ice/Communicator.h> -#include <Ice/Observer.h> #include <Ice/GC.h> #include <Ice/MetricsAdminI.h> -#include <Ice/ObserverI.h> +#include <Ice/InstrumentationI.h> #include <IceUtil/UUID.h> #include <IceUtil/Mutex.h> @@ -1115,10 +1114,9 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi _initData.observer = observer; // - // Make sure the observer receives property update notifications to update - // the metrics admin configuration. + // Make sure the admin plugin receives property updates. // - props->addUpdateCallback(observer); + props->addUpdateCallback(admin); } __setNoDelete(false); |