Skip to content

Commit

Permalink
Require goplugin build flag to enable go plugin support (influxdata#6393
Browse files Browse the repository at this point in the history
)

(cherry picked from commit 776e92f)
  • Loading branch information
danielnelson committed Sep 20, 2019
1 parent 797c24a commit 5facdef
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 34 deletions.
36 changes: 2 additions & 34 deletions cmd/telegraf/telegraf.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ import (
_ "net/http/pprof" // Comment this line to disable pprof endpoint.
"os"
"os/signal"
"path"
"path/filepath"
"plugin"
"runtime"
"strings"
"syscall"
Expand All @@ -21,6 +18,7 @@ import (
"github.com/influxdata/telegraf/agent"
"github.com/influxdata/telegraf/internal"
"github.com/influxdata/telegraf/internal/config"
"github.com/influxdata/telegraf/internal/goplugin"
"github.com/influxdata/telegraf/logger"
_ "github.com/influxdata/telegraf/plugins/aggregators/all"
"github.com/influxdata/telegraf/plugins/inputs"
Expand Down Expand Up @@ -116,36 +114,6 @@ func reloadLoop(
}
}

// loadExternalPlugins loads external plugins from shared libraries (.so, .dll, etc.)
// in the specified directory.
func loadExternalPlugins(rootDir string) error {
return filepath.Walk(rootDir, func(pth string, info os.FileInfo, err error) error {
// Stop if there was an error.
if err != nil {
return err
}

// Ignore directories.
if info.IsDir() {
return nil
}

// Ignore files that aren't shared libraries.
ext := strings.ToLower(path.Ext(pth))
if ext != ".so" && ext != ".dll" {
return nil
}

// Load plugin.
_, err = plugin.Open(pth)
if err != nil {
return fmt.Errorf("error loading %s: %s", pth, err)
}

return nil
})
}

func runAgent(ctx context.Context,
inputFilters []string,
outputFilters []string,
Expand Down Expand Up @@ -318,7 +286,7 @@ func main() {
// Load external plugins, if requested.
if *fPlugins != "" {
log.Printf("I! Loading external plugins from: %s", *fPlugins)
if err := loadExternalPlugins(*fPlugins); err != nil {
if err := goplugin.LoadExternalPlugins(*fPlugins); err != nil {
log.Fatal("E! " + err.Error())
}
}
Expand Down
9 changes: 9 additions & 0 deletions internal/goplugin/noplugin.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// +build !goplugin

package goplugin

import "errors"

func LoadExternalPlugins(rootDir string) error {
return errors.New("go plugin support is not enabled")
}
42 changes: 42 additions & 0 deletions internal/goplugin/plugin.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// +build goplugin

package goplugin

import (
"fmt"
"os"
"path"
"path/filepath"
"plugin"
"strings"
)

// loadExternalPlugins loads external plugins from shared libraries (.so, .dll, etc.)
// in the specified directory.
func LoadExternalPlugins(rootDir string) error {
return filepath.Walk(rootDir, func(pth string, info os.FileInfo, err error) error {
// Stop if there was an error.
if err != nil {
return err
}

// Ignore directories.
if info.IsDir() {
return nil
}

// Ignore files that aren't shared libraries.
ext := strings.ToLower(path.Ext(pth))
if ext != ".so" && ext != ".dll" {
return nil
}

// Load plugin.
_, err = plugin.Open(pth)
if err != nil {
return fmt.Errorf("error loading %s: %s", pth, err)
}

return nil
})
}

0 comments on commit 5facdef

Please sign in to comment.