]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #13690 from jcsp/wip-17503
authorKefu Chai <tchaikov@gmail.com>
Sat, 1 Apr 2017 17:37:31 +0000 (01:37 +0800)
committerGitHub <noreply@github.com>
Sat, 1 Apr 2017 17:37:31 +0000 (01:37 +0800)
mgr: pass through cluster log to plugins

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/mgr/Mgr.cc
src/mgr/Mgr.h
src/mgr/PyFormatter.h
src/mgr/PyModules.cc

diff --cc src/mgr/Mgr.cc
index cdbbb9d0953cd94fdc64a73cb34f609ca8c40b06,b8a731df2c21cbb4b4e2dc12c43f877ce4762487..0492ceff571b82167ebfc5ffcca8733d1125cb49
@@@ -421,9 -421,16 +424,16 @@@ void Mgr::handle_osd_map(
    daemon_state.cull(CEPH_ENTITY_TYPE_OSD, names_exist);
  }
  
+ void Mgr::handle_log(MLog *m)
+ {
+   for (const auto &e : m->entries) {
+     py_modules.notify_all(e);
+   }
+ }
  bool Mgr::ms_dispatch(Message *m)
  {
 -  derr << *m << dendl;
 +  dout(4) << *m << dendl;
    Mutex::Locker l(lock);
  
    switch (m->get_type()) {
diff --cc src/mgr/Mgr.h
Simple merge
Simple merge
Simple merge