Load static plugins in init

License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
ipfs · Nov 4, 2018 · 47dbe90 · 47dbe90
1 parent e1be2f7
commit 47dbe90
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 23 deletions.
diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go
@@ -174,10 +174,11 @@ func makeExecutor(req *cmds.Request, env interface{}) (cmds.Executor, error) {
 		if err != nil {
 			return nil, err
 		}
-		if ok {
-			if _, err := loader.LoadPlugins(pluginpath); err != nil {
-				log.Error("error loading plugins: ", err)
-			}
+		if !ok {
+			pluginpath = ""
+		}
+		if _, err := loader.LoadPlugins(pluginpath); err != nil {
+			log.Error("error loading plugins: ", err)
 		}
 
 		exctr = cmds.NewExecutor(req.Root)

diff --git a/plugin/loader/load.go b/plugin/loader/load.go
@@ -22,28 +22,30 @@ func LoadPlugins(pluginDir string) ([]plugin.Plugin, error) {
 		plMap[v.Name()] = v
 	}
 
-	newPls, err := loadDynamicPlugins(pluginDir)
-	if err != nil {
-		return nil, err
-	}
+	if pluginDir != "" {
+		newPls, err := loadDynamicPlugins(pluginDir)
+		if err != nil {
+			return nil, err
+		}
 
-	for _, pl := range newPls {
-		if ppl, ok := plMap[pl.Name()]; ok {
-			// plugin is already preloaded
-			return nil, fmt.Errorf(
-				"plugin: %s, is duplicated in version: %s, "+
-					"while trying to load dynamically: %s",
-				ppl.Name(), ppl.Version(), pl.Version())
+		for _, pl := range newPls {
+			if ppl, ok := plMap[pl.Name()]; ok {
+				// plugin is already preloaded
+				return nil, fmt.Errorf(
+					"plugin: %s, is duplicated in version: %s, "+
+						"while trying to load dynamically: %s",
+					ppl.Name(), ppl.Version(), pl.Version())
+			}
+			plMap[pl.Name()] = pl
 		}
-		plMap[pl.Name()] = pl
 	}
 
 	pls := make([]plugin.Plugin, 0, len(plMap))
 	for _, v := range plMap {
 		pls = append(pls, v)
 	}
 
-	err = initialize(pls)
+	err := initialize(pls)
 	if err != nil {
 		return nil, err
 	}

diff --git a/repo/fsrepo/config_test.go b/repo/fsrepo/config_test.go
@@ -1,4 +1,4 @@
-package fsrepo
+package fsrepo_test
 
 import (
 	"encoding/json"
@@ -7,7 +7,10 @@ import (
 	"reflect"
 	"testing"
 
-	config "gx/ipfs/QmPEpj17FDRpc7K1aArKZp3RsHtzRMKykeK9GVgn4WQGPR/go-ipfs-config"
+	"github.com/ipfs/go-ipfs/plugin/loader"
+	"github.com/ipfs/go-ipfs/repo/fsrepo"
+
+	"gx/ipfs/QmPEpj17FDRpc7K1aArKZp3RsHtzRMKykeK9GVgn4WQGPR/go-ipfs-config"
 )
 
 // note: to test sorting of the mountpoints in the disk spec they are
@@ -72,6 +75,8 @@ var measureConfig = []byte(`{
 }`)
 
 func TestDefaultDatastoreConfig(t *testing.T) {
+	loader.LoadPlugins("")
+
 	dir, err := ioutil.TempDir("", "ipfs-datastore-config-test")
 	if err != nil {
 		t.Fatal(err)
@@ -84,7 +89,7 @@ func TestDefaultDatastoreConfig(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	dsc, err := AnyDatastoreConfig(config.Spec)
+	dsc, err := fsrepo.AnyDatastoreConfig(config.Spec)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -122,7 +127,7 @@ func TestLevelDbConfig(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	dsc, err := AnyDatastoreConfig(spec)
+	dsc, err := fsrepo.AnyDatastoreConfig(spec)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -160,7 +165,7 @@ func TestFlatfsConfig(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	dsc, err := AnyDatastoreConfig(spec)
+	dsc, err := fsrepo.AnyDatastoreConfig(spec)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -198,7 +203,7 @@ func TestMeasureConfig(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	dsc, err := AnyDatastoreConfig(spec)
+	dsc, err := fsrepo.AnyDatastoreConfig(spec)
 	if err != nil {
 		t.Fatal(err)
 	}