Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

plugin: preload git plugin by default #4991

Merged
merged 3 commits into from
Jun 13, 2018
Merged

plugin: preload git plugin by default #4991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47bf883
plugin: preload git plugin by default
magik6k May 1, 2018
8800c7c
bump plugin loading error log from warning to error
magik6k May 1, 2018
6696342
plugin: fix failing t0280-plugin-git
magik6k May 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/ipfs/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ func makeExecutor(req *cmds.Request, env interface{}) (cmds.Executor, error) {
}
if ok {
if _, err := loader.LoadPlugins(pluginpath); err != nil {
log.Warning("error loading plugins: ", err)
log.Error("error loading plugins: ", err)
}
}

Expand Down
5 changes: 4 additions & 1 deletion plugin/loader/preload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@ package loader

import (
"github.com/ipfs/go-ipfs/plugin"
pluginipldgit "github.com/ipfs/go-ipfs/plugin/plugins/git"
)

// DO NOT EDIT THIS FILE
// This file is being generated as part of plugin build process
// To change it, modify the plugin/loader/preload.sh

var preloadPlugins = []plugin.Plugin{}
var preloadPlugins = []plugin.Plugin{
pluginipldgit.Plugins[0],
}
2 changes: 1 addition & 1 deletion plugin/loader/preload_list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
#
# name go-path number of the sub-plugin

#ipldgit github.com/ipfs/go-ipfs/plugin/plugins/git 0
ipldgit github.com/ipfs/go-ipfs/plugin/plugins/git 0
5 changes: 0 additions & 5 deletions test/sharness/t0280-plugin-git.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ fi

test_init_ipfs

test_expect_success "copy plugin" '
mkdir -p "$IPFS_PATH/plugins" &&
cp ../plugins/git.so "$IPFS_PATH/plugins/"
'

# from https://github.com/ipfs/go-ipld-git/blob/master/make-test-repo.sh
test_expect_success "prepare test data" '
tar xzf ../t0280-plugin-git-data/git.tar.gz
Expand Down