]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr: skip past broken modules and load the rest
authorJohn Spray <john.spray@redhat.com>
Mon, 8 Aug 2016 16:09:12 +0000 (17:09 +0100)
committerJohn Spray <john.spray@redhat.com>
Thu, 29 Sep 2016 16:27:05 +0000 (17:27 +0100)
...instead of stopping at the first python module
that fails to load.

Signed-off-by: John Spray <john.spray@redhat.com>
src/mgr/PyModules.cc

index 8c1fe867b02be8ff292b5556ce2e5885d72316da..4fba53c52c6eaaacd5a6504ca68341edba8dfe0d 100644 (file)
@@ -330,8 +330,7 @@ int PyModules::init()
       derr << "Error loading module '" << *module_name << "': "
         << cpp_strerror(r) << dendl;
       derr << handle_pyerror() << dendl;
-
-      return r;
+      // Don't drop out here, load the other modules
     } else {
       // Success!
       modules[*module_name] = mod;