Skip to content

Commit

Permalink
get some changes
Browse files Browse the repository at this point in the history
	modified:   Makefile
	modified:   go.mod
	modified:   go.sum
	modified:   ngw.go
	deleted:    vendor/golang.org/x/sys/plan9/asm.s
	deleted:    vendor/golang.org/x/sys/plan9/asm_plan9_386.s
	deleted:    vendor/golang.org/x/sys/plan9/asm_plan9_amd64.s
	deleted:    vendor/golang.org/x/sys/plan9/asm_plan9_arm.s
	deleted:    vendor/golang.org/x/sys/plan9/const_plan9.go
	deleted:    vendor/golang.org/x/sys/plan9/dir_plan9.go
	deleted:    vendor/golang.org/x/sys/plan9/env_plan9.go
	deleted:    vendor/golang.org/x/sys/plan9/errors_plan9.go
	deleted:    vendor/golang.org/x/sys/plan9/mkall.sh
	deleted:    vendor/golang.org/x/sys/plan9/mkerrors.sh
	deleted:    vendor/golang.org/x/sys/plan9/mksysnum_plan9.sh
	deleted:    vendor/golang.org/x/sys/plan9/pwd_go15_plan9.go
	deleted:    vendor/golang.org/x/sys/plan9/pwd_plan9.go
	deleted:    vendor/golang.org/x/sys/plan9/race.go
	deleted:    vendor/golang.org/x/sys/plan9/race0.go
	deleted:    vendor/golang.org/x/sys/plan9/str.go
	deleted:    vendor/golang.org/x/sys/plan9/syscall.go
	deleted:    vendor/golang.org/x/sys/plan9/syscall_plan9.go
	deleted:    vendor/golang.org/x/sys/plan9/zsyscall_plan9_386.go
	deleted:    vendor/golang.org/x/sys/plan9/zsyscall_plan9_amd64.go
	deleted:    vendor/golang.org/x/sys/plan9/zsyscall_plan9_arm.go
	deleted:    vendor/golang.org/x/sys/plan9/zsysnum_plan9.go
	deleted:    vendor/golang.org/x/sys/windows/aliases.go
	deleted:    vendor/golang.org/x/sys/windows/dll_windows.go
	deleted:    vendor/golang.org/x/sys/windows/env_windows.go
	deleted:    vendor/golang.org/x/sys/windows/eventlog.go
	deleted:    vendor/golang.org/x/sys/windows/exec_windows.go
	deleted:    vendor/golang.org/x/sys/windows/memory_windows.go
	deleted:    vendor/golang.org/x/sys/windows/mkerrors.bash
	deleted:    vendor/golang.org/x/sys/windows/mkknownfolderids.bash
	deleted:    vendor/golang.org/x/sys/windows/mksyscall.go
	deleted:    vendor/golang.org/x/sys/windows/race.go
	deleted:    vendor/golang.org/x/sys/windows/race0.go
	deleted:    vendor/golang.org/x/sys/windows/security_windows.go
	deleted:    vendor/golang.org/x/sys/windows/service.go
	deleted:    vendor/golang.org/x/sys/windows/str.go
	deleted:    vendor/golang.org/x/sys/windows/syscall.go
	deleted:    vendor/golang.org/x/sys/windows/syscall_windows.go
	deleted:    vendor/golang.org/x/sys/windows/types_windows.go
	deleted:    vendor/golang.org/x/sys/windows/types_windows_386.go
	deleted:    vendor/golang.org/x/sys/windows/types_windows_amd64.go
	deleted:    vendor/golang.org/x/sys/windows/types_windows_arm.go
	deleted:    vendor/golang.org/x/sys/windows/zerrors_windows.go
	deleted:    vendor/golang.org/x/sys/windows/zknownfolderids_windows.go
	deleted:    vendor/golang.org/x/sys/windows/zsyscall_windows.go
	deleted:    vendor/golang.org/x/term/AUTHORS
	deleted:    vendor/golang.org/x/term/CONTRIBUTING.md
	deleted:    vendor/golang.org/x/term/CONTRIBUTORS
	deleted:    vendor/golang.org/x/term/LICENSE
	deleted:    vendor/golang.org/x/term/PATENTS
	deleted:    vendor/golang.org/x/term/README.md
	deleted:    vendor/golang.org/x/term/go.mod
	deleted:    vendor/golang.org/x/term/go.sum
	deleted:    vendor/golang.org/x/term/term.go
	deleted:    vendor/golang.org/x/term/term_aix.go
	deleted:    vendor/golang.org/x/term/term_bsd.go
	deleted:    vendor/golang.org/x/term/term_linux.go
	deleted:    vendor/golang.org/x/term/term_plan9.go
	deleted:    vendor/golang.org/x/term/term_solaris.go
	deleted:    vendor/golang.org/x/term/term_unix.go
	deleted:    vendor/golang.org/x/term/term_unsupported.go
	deleted:    vendor/golang.org/x/term/term_windows.go
	modified:   vendor/modules.txt
  • Loading branch information
xxxmailk committed Jan 14, 2020
1 parent 32cd03b commit 31128d4
Show file tree
Hide file tree
Showing 67 changed files with 25 additions and 19,172 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pack:
@echo "-> making package"
@if [ ! -d /root/go/dist ];then mkdir /root/go/dist; fi;
@tar czvf /root/go/dist/ngw.tar.gz ngw ngw.yml ngw_operator/ngw_operator
@cd .. && tar czvf /root/go/dist/ngw.tar.gz ngw/ngw ngw/ngw.yml ngw/ngw_operator/ngw_operator ngw/Makefile

build: build_ngw build_agent

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/pkg/sftp v1.10.1
github.com/sirupsen/logrus v1.4.2
golang.org/x/crypto v0.0.0-20191219195013-becbf705a915
golang.org/x/term v0.0.0-20191110171634-ad39bd3f0407
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 // indirect
gopkg.in/yaml.v2 v2.2.2
)

Expand Down
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/p
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/term v0.0.0-20191110171634-ad39bd3f0407 h1:5zh5atpUEdIc478E/ebrIaHLKcfVvG6dL/fGv7BcMoM=
golang.org/x/term v0.0.0-20191110171634-ad39bd3f0407/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
24 changes: 23 additions & 1 deletion ngw.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"fmt"
"ngw/conf"
"ngw/run"
"os"
)

//**********创建************
Expand Down Expand Up @@ -60,10 +61,31 @@ func main() {
flag.Parse()
if *f_create {
if *f_cluster == "" {
fmt.Println("error: ")
fmt.Println("error: cluster name cannot be null")
os.Exit(2)
}
if *f_pool == "" {
fmt.Println("error: pool name cannot be null")
os.Exit(2)
}
if *f_rbd == "" {
fmt.Println("error: rbd name cannot be null")
os.Exit(2)
}
run.CreateVolume(*f_cluster, *f_pool, *f_rbd, *f_size, *f_format, *f_force)
} else if *f_delete {
if *f_cluster == "" {
fmt.Println("error: cluster name cannot be null")
os.Exit(2)
}
if *f_pool == "" {
fmt.Println("error: pool name cannot be null")
os.Exit(2)
}
if *f_rbd == "" {
fmt.Println("error: rbd name cannot be null")
os.Exit(2)
}
run.RemoveVolume(*f_cluster, *f_pool, *f_rbd, *f_format, *f_force)
} else if *f_tree {
c := conf.GetConfig()
Expand Down
8 changes: 0 additions & 8 deletions vendor/golang.org/x/sys/plan9/asm.s

This file was deleted.

30 changes: 0 additions & 30 deletions vendor/golang.org/x/sys/plan9/asm_plan9_386.s

This file was deleted.

30 changes: 0 additions & 30 deletions vendor/golang.org/x/sys/plan9/asm_plan9_amd64.s

This file was deleted.

25 changes: 0 additions & 25 deletions vendor/golang.org/x/sys/plan9/asm_plan9_arm.s

This file was deleted.

70 changes: 0 additions & 70 deletions vendor/golang.org/x/sys/plan9/const_plan9.go

This file was deleted.

Loading

0 comments on commit 31128d4

Please sign in to comment.