Merge pull request #56 from aserto-dev/fix_bundle_check

Only check bundle status if runtime is started
aserto-dev · Aug 6, 2024 · 91a627e · 91a627e
2 parents 6b2a98f + 32c6fe7
commit 91a627e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/plugins.go b/plugins.go
@@ -87,7 +87,7 @@ func (r *Runtime) pluginsLoaded() bool {
 			continue
 		}
 
-		if pluginName == bundlePluginName || status.State == plugins.StateNotReady {
+		if (pluginName == bundlePluginName || status.State == plugins.StateNotReady) && r.Started {
 			bundles, err := r.GetBundles(timeoutCxt)
 			if err == nil && len(bundles) > 0 {
 				// if bundle plugin state is not ready after a reconfiguration, forcefully update plugin state if bundles are loaded.

diff --git a/runtime.go b/runtime.go
@@ -438,8 +438,8 @@ func (r *Runtime) Start(ctx context.Context) error {
 // Stop - triggers plugin manager to stop all plugins.
 func (r *Runtime) Stop(ctx context.Context) {
 	if r.Started {
-		r.pluginsManager.Stop(ctx)
 		r.Started = false
+		r.pluginsManager.Stop(ctx)
 	}
 }