From b0d4eac41dfba5278169b5ee6d1befc204736e33 Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Sun, 16 Jul 2017 11:04:25 +0200 Subject: [PATCH 1/4] plugin: make the info about non-executable file in plugins dir and Error log License: MIT Signed-off-by: Jakub Sztandera --- plugin/loader/load_linux.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/loader/load_linux.go b/plugin/loader/load_linux.go index 4d1a18cf8..ee867a246 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 } From 3aa370afe1aa925d88790f237d9037fd1c2f9723 Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Sun, 16 Jul 2017 11:18:38 +0200 Subject: [PATCH 2/4] plugin: remove debug error log License: MIT Signed-off-by: Jakub Sztandera --- plugin/loader/load_linux.go | 1 - 1 file changed, 1 deletion(-) diff --git a/plugin/loader/load_linux.go b/plugin/loader/load_linux.go index ee867a246..bce5e3c16 100644 --- a/plugin/loader/load_linux.go +++ b/plugin/loader/load_linux.go @@ -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 { From 3f00b589d7f1a1431053075d94f24a1f59a38dc9 Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Sun, 16 Jul 2017 11:28:02 +0200 Subject: [PATCH 3/4] plugin: include empty version of preload.go License: MIT Signed-off-by: Jakub Sztandera --- plugin/loader/.gitignore | 1 - plugin/loader/preload.go | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) delete mode 100644 plugin/loader/.gitignore create mode 100644 plugin/loader/preload.go 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/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{} From f07056f1468ffe1ca9848b472eb8c540513fdbfc Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Sun, 16 Jul 2017 11:30:15 +0200 Subject: [PATCH 4/4] plugin: add small comment warning License: MIT Signed-off-by: Jakub Sztandera --- plugin/loader/Rules.mk | 2 +- plugin/loader/preload.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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/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 <