Dev (#91)

* add daemon flags and version info when building

Dockerfile

@@ -10,7 +10,7 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositorie
 COPY go.mod go.sum ./
 RUN go mod download
 COPY . .
-RUN cd cmd && go build koko.go
+RUN cd cmd && go build -ldflags "-X 'main.Buildstamp=`date -u '+%Y-%m-%d %I:%M:%S%p'`' -X 'main.Githash=`git rev-parse HEAD`' -X 'main.Goversion=`go version`'" -x -o koko koko.go
 
 FROM alpine
 WORKDIR /opt/koko/

cmd/Makefile

@@ -14,7 +14,7 @@ SOFTWARENAME=$(NAME)-$(VERSION)
 KOKOSRCFILE= koko.go
 BUILDDIR:=$(BASEPATH)/../build
 ASSETS=locale static templates config_example.yml
-
+GOFLAGS="-X 'main.Buildstamp=`date -u '+%Y-%m-%d %I:%M:%S%p'`' -X 'main.Githash=`git rev-parse HEAD`' -X 'main.Goversion=`go version`'"
 PLATFORMS := linux darwin
 
 .PHONY: release
@@ -30,7 +30,7 @@ Asset:
 .PHONY: $(PLATFORMS)
 $(PLATFORMS): Asset
 	@echo "编译" $@
-	GOOS=$@ GOARCH=amd64 go build -o $(NAME) $(KOKOSRCFILE)
+	GOOS=$@ GOARCH=amd64 go build -ldflags $(GOFLAGS) -x -o $(NAME) $(KOKOSRCFILE)
 	cp -f $(NAME) $(DIRNAME)
 	tar czvf $(BUILDDIR)/$(SOFTWARENAME)-$@-amd64.tar.gz $(DIRNAME)
 

cmd/koko.go

 package main
 
 import (
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"os"
+	"strconv"
+	"syscall"
+
+	"github.com/sevlyar/go-daemon"
+
 	"github.com/jumpserver/koko/pkg/koko"
 )
 
-func main() {
+func startAsDaemon() {
+	ctx := &daemon.Context{
+		PidFileName: "/tmp/koko.pid",
+		PidFilePerm: 0644,
+		Umask:       027,
+		WorkDir:     "./",
+	}
+	child, err := ctx.Reborn()
+	if err != nil {
+		log.Fatalf("run failed: %v", err)
+	}
+	if child != nil {
+		return
+	}
+	defer ctx.Release()
 	koko.RunForever()
 }
+
+var (
+	Buildstamp = ""
+	Githash    = ""
+	Goversion  = ""
+
+	pidPath = "/tmp/koko.pid"
+
+	daemonFlag    = false
+	runSignalFlag = "start"
+	infoFlag      = false
+)
+
+func init() {
+	flag.BoolVar(&daemonFlag, "d", false, "start as Daemon")
+	flag.StringVar(&runSignalFlag, "s", "start", "start | stop")
+	flag.BoolVar(&infoFlag, "V", false, "version info")
+}
+
+func main() {
+	flag.Parse()
+	if infoFlag {
+		fmt.Printf("Version:             %s\n", koko.Version)
+		fmt.Printf("Git Commit Hash:     %s\n", Githash)
+		fmt.Printf("UTC Build Time :     %s\n", Buildstamp)
+		fmt.Printf("Go Version:          %s\n", Goversion)
+		return
+	}
+
+	if runSignalFlag == "stop" {
+		pid, err := ioutil.ReadFile(pidPath)
+		if err != nil {
+			log.Fatal("File not exist")
+			return
+		}
+		pidInt, _ := strconv.Atoi(string(pid))
+		err = syscall.Kill(pidInt, syscall.SIGTERM)
+		if err != nil {
+			log.Fatalf("Stop failed: %v", err)
+		} else {
+			_ = os.Remove(pidPath)
+		}
+		return
+	}
+
+	switch {
+	case daemonFlag:
+		startAsDaemon()
+	default:
+		koko.RunForever()
+	}
+}
\ No newline at end of file

go.mod

@@ -27,6 +27,7 @@ require (
 	github.com/pkg/errors v0.8.1
 	github.com/pkg/sftp v1.10.0
 	github.com/satori/go.uuid v1.2.0
+	github.com/sevlyar/go-daemon v0.1.5 // indirect
 	github.com/sirupsen/logrus v1.4.2
 	github.com/stretchr/testify v1.3.0 // indirect
 	github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca

go.sum

@@ -72,6 +72,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
+github.com/sevlyar/go-daemon v0.1.5 h1:Zy/6jLbM8CfqJ4x4RPr7MJlSKt90f00kNM1D401C+Qk=
+github.com/sevlyar/go-daemon v0.1.5/go.mod h1:6dJpPatBT9eUwM5VCw9Bt6CdX9Tk6UWvhW3MebLDRKE=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

pkg/koko/koko.go

@@ -16,14 +16,14 @@ import (
 	"github.com/jumpserver/koko/pkg/sshd"
 )
 
-const version = "1.5.3"
+const Version = "1.5.3"
 
 type Coco struct {
 }
 
 func (c *Coco) Start() {
 	fmt.Println(time.Now().Format("2006-01-02 15:04:05"))
-	fmt.Printf("Coco version %s, more see https://www.jumpserver.org\n", version)
+	fmt.Printf("Koko Version %s, more see https://www.jumpserver.org\n", Version)
 	fmt.Println("Quit the server with CONTROL-C.")
 	go sshd.StartServer()
 	go httpd.StartHTTPServer()