From 980a4d11c3101e1c0d864f47f4845060cb2d6a63 Mon Sep 17 00:00:00 2001 From: Boshi Lian Date: Fri, 23 Feb 2018 21:05:09 +0800 Subject: [PATCH] move loader to main package --- sshpiperd/auditor/loader/load.go | 5 ----- sshpiperd/challenger/loader/load.go | 6 ------ sshpiperd/cmd.go | 3 --- sshpiperd/loader.go | 11 +++++++++++ sshpiperd/upstream/loader/load.go | 6 ------ 5 files changed, 11 insertions(+), 20 deletions(-) delete mode 100644 sshpiperd/auditor/loader/load.go delete mode 100644 sshpiperd/challenger/loader/load.go create mode 100644 sshpiperd/loader.go delete mode 100644 sshpiperd/upstream/loader/load.go diff --git a/sshpiperd/auditor/loader/load.go b/sshpiperd/auditor/loader/load.go deleted file mode 100644 index 98a3a7e7..00000000 --- a/sshpiperd/auditor/loader/load.go +++ /dev/null @@ -1,5 +0,0 @@ -package loader - -import ( - _ "github.com/tg123/sshpiper/sshpiperd/auditor/typescriptlogger" // init plugin -) diff --git a/sshpiperd/challenger/loader/load.go b/sshpiperd/challenger/loader/load.go deleted file mode 100644 index c9f7a69e..00000000 --- a/sshpiperd/challenger/loader/load.go +++ /dev/null @@ -1,6 +0,0 @@ -package loader - -import ( - _ "github.com/tg123/sshpiper/sshpiperd/challenger/pam" // init plugin - _ "github.com/tg123/sshpiper/sshpiperd/challenger/welcometext" // init plugin -) diff --git a/sshpiperd/cmd.go b/sshpiperd/cmd.go index bb98909d..5d0940e8 100644 --- a/sshpiperd/cmd.go +++ b/sshpiperd/cmd.go @@ -8,12 +8,9 @@ import ( "github.com/jessevdk/go-flags" "github.com/tg123/sshpiper/sshpiperd/auditor" - _ "github.com/tg123/sshpiper/sshpiperd/auditor/loader" "github.com/tg123/sshpiper/sshpiperd/challenger" - _ "github.com/tg123/sshpiper/sshpiperd/challenger/loader" "github.com/tg123/sshpiper/sshpiperd/registry" "github.com/tg123/sshpiper/sshpiperd/upstream" - _ "github.com/tg123/sshpiper/sshpiperd/upstream/loader" ) type subCommand struct{ callback func(args []string) error } diff --git a/sshpiperd/loader.go b/sshpiperd/loader.go new file mode 100644 index 00000000..9594dfa2 --- /dev/null +++ b/sshpiperd/loader.go @@ -0,0 +1,11 @@ +package main + +import ( + _ "github.com/tg123/sshpiper/sshpiperd/upstream/mysql" + _ "github.com/tg123/sshpiper/sshpiperd/upstream/workingdir" + + _ "github.com/tg123/sshpiper/sshpiperd/challenger/pam" + _ "github.com/tg123/sshpiper/sshpiperd/challenger/welcometext" + + _ "github.com/tg123/sshpiper/sshpiperd/auditor/typescriptlogger" +) diff --git a/sshpiperd/upstream/loader/load.go b/sshpiperd/upstream/loader/load.go deleted file mode 100644 index b7d65074..00000000 --- a/sshpiperd/upstream/loader/load.go +++ /dev/null @@ -1,6 +0,0 @@ -package loader - -import ( - _ "github.com/tg123/sshpiper/sshpiperd/upstream/mysql" // init plugin - _ "github.com/tg123/sshpiper/sshpiperd/upstream/workingdir" // init plugin -)