Merge pull request #80 from NexClipper/master

ralfyang · web-flow · commit e4ea591c6d41 · 2020-08-25T17:35:46.000+09:00
request merge
diff --git a/Dockerfile/agent/klevr b/Dockerfile/agent/klevr
diff --git a/Dockerfile/manager/Dockerfile b/Dockerfile/manager/Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu
-LABEL version=0.3
+LABEL version=0.2
 
 COPY ./conf/* /conf/
 COPY ./klevr-manager /
diff --git a/Dockerfile/manager/klevr-manager b/Dockerfile/manager/klevr-manager
diff --git a/Dockerfile/manager/klevr-manager2 b/Dockerfile/manager/klevr-manager2
diff --git a/cmd/klevr-agent/main.go b/cmd/klevr-agent/main.go
@@ -8,6 +8,8 @@ import (
 	"os/exec"
 	"strconv"
 	"strings"
+	"sync"
+
 	//"bytes"
 	//"crypto/sha1"
 	//"encoding/base64"
@@ -80,6 +82,8 @@ var Result_buffer string
 var Body common.Body
 var Primary_alivecheck_time int64
 var ping bool
+var doOnce sync.Once
+
 ///// Mode_debug = dev or not
 //var Mode_debug string = "dev"
 //
@@ -581,6 +585,7 @@ func printprimary(){
 	logger.Debugf("Primary ip : %s, My ip : %s", Primary_ip, Local_ip_add)
 }
 
+
 func getCommand(){
 	uri := Klevr_manager + "/agents/commands/init"
 
@@ -591,40 +596,80 @@ func getCommand(){
 		logger.Error(err)
 	}
 
+	id := Body.Task[0].ID
 	coms := Body.Task[0].Command
 	com := strings.Split(coms, "\n")
+	//logger.Debugf("%v", string(result))
 
 	filenum := len(com)
 
-
-
 	for i:=0; i<filenum-1; i++{
 		num := strconv.Itoa(i)
 
-		if(com[i] == string(readFile(Commands+num))){
+		var read string
+
+		err := json.Unmarshal(readFile(Commands+num), &read)
+		if err != nil{
+			logger.Error(err)
+		}
+
+		if(com[i] == read){
 			logger.Debugf("same command")
 		} else {
 			logger.Debugf("%d-----%s", i, com[i])
 			writeFile(Commands+num, com[i])
+
+			execute := SSH_provbee + com[i]
+			//execute := com[i]
+
+			exe := exec.Command("sh", "-c", execute)
+			errExe := exe.Run()
+			if errExe != nil{
+				logger.Error(errExe)
+			} else {
+				exe.Wait()
+
+			}
+
+
+			logger.Debugf("====%d=====%s", id, coms)
+			//
+			//doOnce.Do(func() {
+			//	logger.Debugf("----------------test")
+			//	primaryInit(Body, coms, "done")
+			//})
 		}
 	}
 
-	for i:=0; i<filenum-1; i++{
-		num := strconv.Itoa(i)
-		command := readFile(Commands+num)
-
-		execute := SSH_provbee + string(command)[1:len(string(command))-1]
-		logger.Debugf(execute)
-		exe := exec.Command("sh", "-c", execute)
-		errExe := exe.Run()
-		if errExe != nil{
-			logger.Error(errExe)
-		} else {
-			exe.Wait()
-			deleteFile(Commands+num)
-		}
+
+
+
+
+}
+
+func primaryInit(bod common.Body, command string, status string){
+	uri := Klevr_manager + "/agents/zones/init"
+
+	rb := &common.Body{}
+
+	SendMe(rb)
+
+	rb.Task = make([]common.Task, 1)
+	rb.Task[0].ID = bod.Task[0].ID
+	rb.Task[0].AgentKey = bod.Task[0].AgentKey
+	rb.Task[0].Command = command
+	rb.Task[0].Status = status
+	rb.Task[0].Params = bod.Task[0].Params
+	rb.Task[0].Result = bod.Task[0].Result
+	rb.Task[0].Type = bod.Task[0].Type
+
+	b, err := json.Marshal(rb)
+	if err != nil {
+		logger.Error(err)
 	}
 
+	result := communicator.Post_Json_http(uri, b, Klevr_agent_id_get(), API_key_id, Klevr_zone)
+	logger.Debugf(string(result))
 }
 
 func writeFile(path string, data string) {
@@ -650,6 +695,7 @@ func deleteFile(path string){
 	if err != nil {
 		logger.Error(err)
 	}
+
 }
 
 func main() {
@@ -684,8 +730,8 @@ func main() {
 
 	if Check_primary() == "true"{
 		s := gocron.NewScheduler()
-		s.Every(10).Seconds().Do(printprimary)
-		s.Every(10).Seconds().Do(getCommand)
+		s.Every(5).Seconds().Do(printprimary)
+		s.Every(5).Seconds().Do(getCommand)
 
 		go func() {
 			<-s.Start()
diff --git a/cmd/klevr-agent/test/test b/cmd/klevr-agent/test/test
@@ -0,0 +1,11 @@
+test
+test
+test
+test
+test
+test
+test
+test
+test
+test
+test
diff --git a/cmd/klevr-manager/Makefile b/cmd/klevr-manager/Makefile
@@ -1,4 +1,4 @@
-docker_version="latest"
+docker_version="chopa2"
 
 hello:
 	#
@@ -13,7 +13,8 @@ require:
 	go get -u
 #	curl -sL bit.ly/go_req | bash
 build: require
-	GOOS=linux GOARCH=amd64 go build -o ./Docker/klevr-manager ./main.go
+	go build -o ./Docker/klevr-manager ./main.go
+	#GOOS=linux GOARCH=amd64 go build -o ./Docker/klevr-manager ./main.go
 run:
 	go run ./main.go -config ../../conf/klevr-manager-local.yml
 login:
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
          - "3306:3306"
 
    klevr-manager:
-      image: klevry/klevr-manager
+      image: klevry/klevr-manager:latest
       ports: 
          - "8090:8090"
       depends_on: 
diff --git a/go.mod b/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/golang/protobuf v1.4.2 // indirect
 	github.com/golang/snappy v0.0.1 // indirect
 	github.com/gorilla/context v1.1.1
-	github.com/gorilla/mux v1.7.4
+	github.com/gorilla/mux v1.8.0
 	github.com/jasonlvhit/gocron v0.0.1
 	github.com/json-iterator/go v1.1.10 // indirect
 	github.com/kelseyhightower/envconfig v1.4.0
@@ -31,7 +31,7 @@ require (
 	github.com/urfave/cli/v2 v2.2.0
 	github.com/zcalusic/sysinfo v0.0.0-20200228145645-a159d7cc708b
 	golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect
-	golang.org/x/sys v0.0.0-20200821140526-fda516888d29 // indirect
+	golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8 // indirect
 	golang.org/x/text v0.3.3 // indirect
 	google.golang.org/protobuf v1.25.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
diff --git a/go.sum b/go.sum
@@ -1,3 +1,4 @@
+<<<<<<< Updated upstream
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU=
@@ -99,6 +100,8 @@ github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc=
 github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
+github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
+github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
@@ -233,6 +236,8 @@ golang.org/x/sys v0.0.0-20200820212457-1fb795427249 h1:tKP05IMsVLZ4VeeCEFmrIUmxA
 golang.org/x/sys v0.0.0-20200820212457-1fb795427249/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200821140526-fda516888d29 h1:mNuhGagCf3lDDm5C0376C/sxh6V7fy9WbdEu/YDNA04=
 golang.org/x/sys v0.0.0-20200821140526-fda516888d29/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8 h1:AvbQYmiaaaza3cW3QXRyPo5kYgpFIzOAfeAAN7m3qQ4=
+golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -276,15 +281,12 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-k8s.io/apimachinery v0.18.6 h1:RtFHnfGNfd1N0LeSrKCUznz5xtUP1elRGvHJbL3Ntag=
-k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko=
 k8s.io/apimachinery v0.18.8 h1:jimPrycCqgx2QPearX3to1JePz7wSbVLq+7PdBTTwQ0=
 k8s.io/apimachinery v0.18.8/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
diff --git a/pkg/common/context.go b/pkg/common/context.go
@@ -1,5 +1,7 @@
 package common
 
+var immutableStore = make(map[string]interface{})
+var mutableStore = make(map[string]interface{})
 var store = make(map[string]interface{})
 
 // ContextPut put value with key
diff --git a/pkg/communicator/communicator.go b/pkg/communicator/communicator.go
@@ -114,3 +114,28 @@ func Post_http(url, data, api_key_string string) {
 	}
 	defer res.Body.Close()
 }
+
+func Post_Json_http(url string, data []byte, agent string, api string, zone string) []byte{
+	var body []byte
+	req, err := http.NewRequest("POST", url, bytes.NewBuffer(data))
+	if err != nil{
+		log.Printf("HTTP PUT Request error: ", err)
+	}
+
+	req.Header.Set("Content-Type", "json/application; charset=utf-8")
+	req.Header.Add("X-AGENT-KEY", agent)
+	req.Header.Add("X-ZONE-ID", zone)
+	req.Header.Add("X-API-KEY", api)
+
+	res, err := http.DefaultClient.Do(req)
+	if err == nil {
+		defer res.Body.Close()
+		body, _ = ioutil.ReadAll(res.Body)
+		http_body_buffer = string(body)
+		//logger.Debugf("%v", http_body_buffer)
+	} else{
+		log.Println(err)
+	}
+
+	return body
+}
diff --git a/pkg/manager/api_agent.go b/pkg/manager/api_agent.go
@@ -164,6 +164,7 @@ func (api *API) getInitCommand(w http.ResponseWriter, r *http.Request) {
 	jsonParam, _ := json.Marshal(param)
 
 	task := api.addTask(tx, common.INLINE, "INIT", ch.ZoneID, ch.AgentKey, string(jsonParam))
+	logger.Debug("created task : %v", task)
 
 	// response 데이터 생성
 	rb := &common.Body{}
diff --git a/pkg/manager/repository.go b/pkg/manager/repository.go
@@ -229,14 +229,24 @@ func (tx *Tx) updateLock(tl *TaskLock) {
 }
 
 func (tx *Tx) insertTask(t *Tasks) *Tasks {
-	cnt, err := tx.Insert(t)
+	result, err := tx.Exec("INSERT INTO `TASKS` (`id`,`type`,`command`,`zone_id`,`agent_key`,`exe_agent_key`,`status`,`params`,`updated_at`) VALUES (?,?,?,?,?,?,?,?,?)",
+		t.Id, t.Type, t.Command, t.ZoneId, t.AgentKey, t.ExeAgentKey, t.Status, t.Params, time.Now().UTC())
+	// cnt, err := tx.Insert(t)
+
+	cnt, _ := result.RowsAffected()
 
 	if err != nil {
 		panic(err)
 	} else if cnt != 1 {
 		common.PanicForUpdate("inserted", cnt, 1)
 	}
 
+	id, _ := result.LastInsertId()
+
+	t.Id = uint64(id)
+
+	logger.Debugf("Inserted task : %v", t)
+
 	return t
 }
 
@@ -252,3 +262,11 @@ func (tx *Tx) updateTask(t *Tasks) {
 		common.PanicForUpdate("updated", cnt, 1)
 	}
 }
+
+func (tx *Tx) getTask(id uint64) (*Tasks, bool) {
+	var task Tasks
+	exist := common.CheckGetQuery(tx.Where("id = ?", id).Get(&task))
+	logger.Debugf("Selected Task : %v", task)
+
+	return &task, exist
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,11 @@ @@
 +test
 +test
 +test
 +test
 +test
 +test
 +test
 +test
 +test
 +test
 +test