merge

Makefile

@@ -1,4 +1,7 @@
-all: clean init gibbon tarball
+all: clean init gibbon agent tarball
+
+agent:
+	cd gibbonagent; GOOS=linux GOARCH=arm go build -o agent; go build -o agent.amd64
 
 init:
 	mkdir -p output
@@ -11,12 +14,16 @@ gibbon:
 #	cd gibbonapi && go build
 
 tarball: init gibbon
-	cp control.sh output
-	cp -r etc output
+	cp gibbond/control.sh output
+	mkdir -p output/etc
+	cp gibbond/etc/conf_product.json output/etc/conf.json
+	cp gibbond/etc/log.xml output/etc/log.xml
+	cp gibbond/etc/supervisord.conf output/etc/
 	cp misc/setupenv.sh output
 	tar -czf gibbon.tgz output
 
 clean:
 	go clean
 	rm -rf gibbon gibbon.tgz output
-
+	rm -f test/test
+	rm -f gibbonagent/agent gibbonagent/agent.amd64

cloud/def.go

@@ -0,0 +1,16 @@
+package cloud
+
+const (
+	ERR_NOERROR     = 10000
+	ERR_CMD_TIMEOUT = 20000
+)
+
+type ApiStatus struct {
+	ErrNo  int    `json:"errno"`
+	ErrMsg string `json:"errmsg,omitempty"`
+}
+
+type ApiResponse struct {
+	ApiStatus
+	Data interface{} `json:"data,omitempty"`
+}

comet/message.go

@@ -23,13 +23,14 @@ const (
 )
 
 const (
-	MSG_HEARTBEAT      = uint8(0)
-	MSG_REGISTER       = uint8(1)
-	MSG_REGISTER_REPLY = uint8(2)
-	MSG_REQUEST        = uint8(3)
-	MSG_REQUEST_REPLY  = uint8(4)
-	MSG_ROUTER_COMMAND        = uint8(10)
-	MSG_ROUTER_COMMAND_REPLY  = uint8(11)
+	MSG_HEARTBEAT            = uint8(0)
+	MSG_REGISTER             = uint8(1)
+	MSG_REGISTER_REPLY       = uint8(2)
+	MSG_ROUTER_COMMAND       = uint8(3)
+	MSG_ROUTER_COMMAND_REPLY = uint8(4)
+
+//	MSG_REQUEST              = uint8(3)
+//	MSG_REQUEST_REPLY        = uint8(4)
 )
 
 // msg to byte
@@ -54,18 +55,25 @@ type RegisterMessage struct {
 }
 
 type RegisterReplyMessage struct {
+	HeartbeatInterval int `json:"bt_interval"`
+}
+
+type CommandRequest struct {
+	Uid string `json:"uid"`
+	Cmd string `json:"cmd"`
 }
 
 type RouterCommandMessage struct {
-	Uid	string		`json:"uid"`
-	Cmd struct {
-		Forward string `json:"forward"`
-	}				`json:"cmd"`
+	Uid string `json:"uid"`
+	Cmd string `json:"cmd"`
 }
 
-type RouterCommandReplyMessage struct {
-	Status int		`json:"status"`
-	Descr string	`json:"descr"`
-	Result string	`json:"result"`
+type RouterCommand struct {
+	Forward string `json:"forward"`
 }
 
+type RouterCommandReplyMessage struct {
+	Status int    `json:"status"`
+	Descr  string `json:"descr"`
+	Result string `json:"result"`
+}