From 3758a8c91ea8cb75dc780e29a1222129cea6c37a Mon Sep 17 00:00:00 2001
From: aaron <462826@qq.com>
Date: Tue, 22 Dec 2020 16:39:35 +0800
Subject: [PATCH] restart after upgrade

---
 Makefile                          |  4 +---
 go.mod                            |  1 +
 go.sum                            |  2 ++
 src/server/service/upgrade.go     |  2 ++
 src/server/utils/common/script.go |  2 +-
 src/utils/common/utils.go         | 10 ++++++++++
 src/utils/config/config.go        |  2 +-
 7 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index a79c10bf..14da13aa 100644
--- a/Makefile
+++ b/Makefile
@@ -69,6 +69,4 @@ upload_to:
 	@echo 'upload...'
 	@find ${QINIU_DIR} -name ".DS_Store" -type f -delete
 	@qshell qupload2 --src-dir=${QINIU_DIR} --bucket=download --thread-count=10 --log-file=qshell.log \
-					--skip-path-prefixes=zendata --rescan-local
-	@qshell qupload2 --src-dir=/Users/aaron/work/zentao/qiniu/ --bucket=download --thread-count=10 --log-file=qshell.log \
-					--skip-path-prefixes=zendata,ztf --rescan-local --overwrite
+					--skip-path-prefixes=zendata --rescan-local --overwrite
diff --git a/go.mod b/go.mod
index 9ff72b21..4f1816c5 100644
--- a/go.mod
+++ b/go.mod
@@ -5,6 +5,7 @@ go 1.12
 require golang.org/x/text v0.3.2
 
 require (
+	bitbucket.org/kardianos/osext v0.0.0-20181027061946-15c52d0993e9
 	github.com/ajg/form v1.5.1
 	github.com/awesome-gocui/gocui v0.6.0
 	github.com/bitly/go-simplejson v0.5.0
diff --git a/go.sum b/go.sum
index ec247d7d..4cf3ed56 100644
--- a/go.sum
+++ b/go.sum
@@ -1,3 +1,5 @@
+bitbucket.org/kardianos/osext v0.0.0-20181027061946-15c52d0993e9 h1:e4OTPTo8CRlaXb79fvCXZIHLLOgAf4r360j6NspbhRk=
+bitbucket.org/kardianos/osext v0.0.0-20181027061946-15c52d0993e9/go.mod h1:gCJCsH2RZ6GzBARZLbHxrfO81GvxS0XbMqlnU8aSli0=
 github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
 github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
diff --git a/src/server/service/upgrade.go b/src/server/service/upgrade.go
index 3535d818..67f69be1 100644
--- a/src/server/service/upgrade.go
+++ b/src/server/service/upgrade.go
@@ -90,6 +90,8 @@ func (s *UpgradeService) RestartVersion(version string) (err error) {
 		// update config file
 		vari.Config.Version, _ = strconv.ParseFloat(version, 64)
 		configUtils.SaveConfig(vari.Config)
+
+		commonUtils.Restart()
 	}
 
 	return
diff --git a/src/server/utils/common/script.go b/src/server/utils/common/script.go
index 07364228..0f86d2b1 100644
--- a/src/server/utils/common/script.go
+++ b/src/server/utils/common/script.go
@@ -35,7 +35,7 @@ func Download(uri string, dst string) error {
 	if err != nil {
 		logUtils.PrintTo(i118Utils.I118Prt.Sprintf("download_write_fail", dst, err.Error()))
 	} else {
-		logUtils.PrintTof("download_success", uri, dst)
+		logUtils.PrintTo(i118Utils.I118Prt.Sprintf("download_success", uri, dst))
 	}
 
 	return err
diff --git a/src/utils/common/utils.go b/src/utils/common/utils.go
index 484b1616..a6731de4 100644
--- a/src/utils/common/utils.go
+++ b/src/utils/common/utils.go
@@ -1,12 +1,14 @@
 package commonUtils
 
 import (
+	"bitbucket.org/kardianos/osext"
 	"github.com/easysoft/zentaoatf/src/model"
 	"github.com/easysoft/zentaoatf/src/utils/const"
 	stringUtils "github.com/easysoft/zentaoatf/src/utils/string"
 	"github.com/emirpasic/gods/maps"
 	"net"
 	"os"
+	"os/exec"
 	"path"
 	"path/filepath"
 	"reflect"
@@ -191,3 +193,11 @@ func getIpType(IP net.IP) string {
 	}
 	return ""
 }
+
+func Restart() error {
+	name, err := osext.Executable()
+	if err != nil {
+		return err
+	}
+	return exec.Command(name, os.Args[1:]...).Start()
+}
diff --git a/src/utils/config/config.go b/src/utils/config/config.go
index 9032944c..0596d92c 100644
--- a/src/utils/config/config.go
+++ b/src/utils/config/config.go
@@ -95,7 +95,7 @@ func SaveConfig(conf model.Config) error {
 	cfg.ReflectFrom(&conf)
 
 	cfg.SaveTo(configPath)
-	if i118Utils.I118Prt == nil {
+	if i118Utils.I118Prt == nil { // first time, i118 may not be init.
 		logUtils.PrintToWithColor(fmt.Sprintf("Successfully update config file %s.", configPath), color.FgCyan)
 	} else {
 		logUtils.PrintToWithColor(i118Utils.I118Prt.Sprintf("success_update_config", configPath), color.FgCyan)
-- 
GitLab