chteufleur
/
DataHouse
1
0
Fork 0
Code Issues 13 Pull Requests Releases Wiki Activity

Fix bug on refresh and add relay

This commit is contained in:
Chteufleur 2015-11-01 17:50:46 +01:00
parent b3bd8cc988
commit cfa24b91f5
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
controllers/relay.go
View File

@ -7,6 +7,7 @@ import (
"datahouse/models/variables" "datahouse/models/variables"
"datahouse/models/relay" "datahouse/models/relay"
"strings" "strings"
"time"
) )
@ -60,7 +61,7 @@ func (c *ViewRelayController) Post() {
if r.Id != 0 { if r.Id != 0 {
ret += r.Mac+"/" ret += r.Mac+"/"
if r.IpAddress != "" { if r.IpAddress != "" {
getRep, err := httplib.Get("http://"+r.IpAddress+"/status").String() getRep, err := httplib.Get("http://"+r.IpAddress+"/status").SetTimeout(3 * time.Second, 3 * time.Second).String()
if err == nil { if err == nil {
ret += getRep ret += getRep
} else { } else {
@ -82,12 +83,6 @@ type AddRelayController struct {
beego.Controller beego.Controller
} }
func (c *AddRelayController) Prepare() {
sess := c.GetSession(variables.SessionName)
if sess == nil {
c.Redirect(variables.LoginRoute, 302)
}
}
func (c *AddRelayController) Get() { func (c *AddRelayController) Get() {
ip := strings.Split(c.Ctx.Request.RemoteAddr, ":")[0] ip := strings.Split(c.Ctx.Request.RemoteAddr, ":")[0]
@ -119,7 +114,7 @@ func (c *CommandRelayController) Post() {
mac := c.Ctx.Input.Param(":sensor") mac := c.Ctx.Input.Param(":sensor")
r := relay.GetRelayByMac(mac) r := relay.GetRelayByMac(mac)
if r.Id != 0 { if r.Id != 0 {
httplib.Get("http://"+r.IpAddress+"/toggle").String() httplib.Get("http://"+r.IpAddress+"/toggle").SetTimeout(3 * time.Second, 3 * time.Second).String()
} }
c.Ctx.Output.Body([]byte("")) c.Ctx.Output.Body([]byte(""))