diff --git a/plugin/loader/.gitignore b/plugin/loader/.gitignore deleted file mode 100644 index 5f0355638..000000000 --- a/plugin/loader/.gitignore +++ /dev/null @@ -1 +0,0 @@ -preload.go diff --git a/plugin/loader/Rules.mk b/plugin/loader/Rules.mk index 50e4e743f..01f50e277 100644 --- a/plugin/loader/Rules.mk +++ b/plugin/loader/Rules.mk @@ -1,7 +1,7 @@ include mk/header.mk $(d)/preload.go: d:=$(d) -$(d)/preload.go: $(d)/preload_list +$(d)/preload.go: $(d)/preload_list $(d)/preload.sh $(d)/preload.sh > $@ go fmt $@ >/dev/null diff --git a/plugin/loader/load_linux.go b/plugin/loader/load_linux.go index 4d1a18cf8..bce5e3c16 100644 --- a/plugin/loader/load_linux.go +++ b/plugin/loader/load_linux.go @@ -32,7 +32,7 @@ func linuxLoadFunc(pluginDir string) ([]iplugin.Plugin, error) { // file is not executable let's not load it // this is to prevent loading plugins from for example non-executable // mounts, some /tmp mounts are marked as such for security - log.Warningf("non-executable file in plugins directory: %s", fi) + log.Errorf("non-executable file in plugins directory: %s", fi) return nil } @@ -56,7 +56,6 @@ func loadPlugin(fi string) ([]iplugin.Plugin, error) { if err != nil { return nil, err } - log.Errorf("plugins: %T", pls) typePls, ok := pls.(*[]iplugin.Plugin) if !ok { diff --git a/plugin/loader/preload.go b/plugin/loader/preload.go new file mode 100644 index 000000000..2bfdc3bb3 --- /dev/null +++ b/plugin/loader/preload.go @@ -0,0 +1,7 @@ +package loader + +import ( + "github.com/ipfs/go-ipfs/plugin" +) + +var preloadPlugins = []plugin.Plugin{} diff --git a/plugin/loader/preload.sh b/plugin/loader/preload.sh index 93ee3e43b..cc7945109 100755 --- a/plugin/loader/preload.sh +++ b/plugin/loader/preload.sh @@ -20,6 +20,11 @@ done | sort -u cat <