Skip to content
This repository has been archived by the owner on Jan 19, 2023. It is now read-only.

Commit

Permalink
log plugin startup errors and resume octant startup
Browse files Browse the repository at this point in the history
- Do not error out from octant when plugin startup fails

Signed-off-by: Vikram Yadav <yvikram@vmware.com>

#2796
  • Loading branch information
Vikram Yadav committed Aug 24, 2021
1 parent 0666cae commit f264f57
Showing 1 changed file with 16 additions and 17 deletions.
33 changes: 16 additions & 17 deletions pkg/plugin/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -501,21 +501,9 @@ func (m *Manager) registerJSPlugin(ctx context.Context, pluginPath string) error
return nil
}

func (m *Manager) startJS(ctx context.Context) error {
pluginList, err := AvailablePlugins(DefaultConfig)
if err != nil {
return err
}

for _, pluginPath := range pluginList {
if IsJavaScriptPlugin(pluginPath) {
logger := log.From(ctx)
logger.Debugf("creating ts plugin client")

if err := m.registerJSPlugin(ctx, pluginPath); err != nil {
return fmt.Errorf("javascript plugin: %w", err)
}
}
func (m *Manager) startJS(ctx context.Context, pluginPath string) error {
if err := m.registerJSPlugin(ctx, pluginPath); err != nil {
return fmt.Errorf("javascript plugin: %w", err)
}

return nil
Expand All @@ -541,17 +529,28 @@ func (m *Manager) Start(ctx context.Context) error {
m.lock.Lock()
defer m.lock.Unlock()

if err := m.startJS(ctx); err != nil {
pluginList, err := AvailablePlugins(DefaultConfig)
if err != nil {
return err
}
for _, pluginPath := range pluginList {
if IsJavaScriptPlugin(pluginPath) {
logger := log.From(ctx)
logger.Debugf("creating ts plugin client")

if err := m.startJS(ctx, pluginPath); err != nil {
logger.Warnf("start JS plugin: %s\n", err)
}
}
}

go m.watchJS(ctx)

for i := range m.configs {
c := m.configs[i]

if err := m.start(ctx, c); err != nil {
return err
logger.Warnf("start plugin: %s\n", err)
}
}

Expand Down

0 comments on commit f264f57

Please sign in to comment.