update to task management for remote execution (#130)

* update imporvement of task execution
* update runtaskinremote
* update Improving the processing of tasks determined by the agent to be executed
* update check the status of the task executed on the remote
* update version

pkg/agent/common.go

@@ -3,7 +3,6 @@ package agent
 import (
 	"crypto/rand"
 	"encoding/hex"
-	"encoding/json"
 	"io"
 	"io/ioutil"
 	"log"
@@ -12,7 +11,6 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/Klevry/klevr/pkg/common"
 	"github.com/NexClipper/logger"
 	"github.com/shirou/gopsutil/disk"
 	netutil "k8s.io/apimachinery/pkg/util/net"
@@ -90,27 +88,6 @@ func diskUsage(path string) (d DiskStatus) {
 	return
 }
 
-func jsonMarshal(a interface{}) []byte {
-	b, err := json.Marshal(a)
-	if err != nil {
-		logger.Debugf("%v", string(b))
-		logger.Error(err)
-	}
-
-	return b
-}
-
-func jsonUnmarshal(a []byte) (*common.Body, error) {
-	var body common.Body
-
-	err := json.Unmarshal(a, &body)
-	if err != nil {
-		return nil, err
-	}
-
-	return &body, nil
-}
-
 func readFile(path string) []byte {
 	data, err := ioutil.ReadFile(path)
 	if err != nil {

pkg/agent/handshake.go

@@ -18,7 +18,7 @@ func (agent *KlevrAgent) handShake() *common.Primary {
 	rb := &common.Body{}
 	agent.setBodyMeInfo(rb)
 	logger.Debugf("%v", rb)
-	b := jsonMarshal(rb)
+	b := common.JsonMarshal(rb)
 	// put in & get out
 	httpHandler := communicator.Http{
 		URL:        uri,
@@ -38,7 +38,7 @@ func (agent *KlevrAgent) handShake() *common.Primary {
 
 	logger.Debugf("%s", string(result))
 
-	body, unmarshalError := jsonUnmarshal(result)
+	body, unmarshalError := common.JsonUnmarshal(result)
 	if unmarshalError != nil {
 		logger.Debugf("Handshake url:%s, agent:%s, api:%s, zone:%s",
 			uri, agent.AgentKey, agent.ApiKey, agent.Zone)

pkg/agent/primary_status_report.go

@@ -1,6 +1,7 @@
 package agent
 
 import (
+	"github.com/Klevry/klevr/pkg/common"
 	"github.com/Klevry/klevr/pkg/communicator"
 	"github.com/NexClipper/logger"
 )
@@ -27,7 +28,7 @@ func (agent *KlevrAgent) primaryStatusReport() {
 		return
 	}
 
-	body, err := jsonUnmarshal(result)
+	body, err := common.JsonUnmarshal(result)
 	if err != nil {
 		logger.Debugf("PrimaryStatusReport url:%s, agent:%s, api:%s, zone:%s", uri, agent.AgentKey, agent.ApiKey, agent.Zone)
 		logger.Errorf("The content of payload passed after primarystatusreport is unknown (%v)", err)

pkg/agent/protobuf/task.proto

@@ -6,6 +6,7 @@ package agent;
 service TaskSend{
   rpc SendTask(Message) returns (Message) {}
   rpc StatusCheck(Status) returns (Status) {}
+  rpc GetUpdatedTasks(Message) returns (Message) {}
 }
 
 message Message{