mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NetReceiver vars updating again. sendTo() now takes a *netsender.Sender.

This commit is contained in:
Alan Noble 2018-06-15 17:29:59 +09:30
parent 5ba5327f33
commit 82f58ec996
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/revid-cli/main.go
View File

@ -250,8 +250,6 @@ func main() {
l.Log(progName, "Error", err.Error()) // TODO(kortschak): Make this "Fatal" when that exists. l.Log(progName, "Error", err.Error()) // TODO(kortschak): Make this "Fatal" when that exists.
os.Exit(1) os.Exit(1)
} }
vs = ns.GetVarSum()
} else { } else {
// alternatively, instantiate our own logger // alternatively, instantiate our own logger
config.Logger = smartlogger.New(loggerVerbosity, smartlogger.File, "/var/log/netsender/") config.Logger = smartlogger.New(loggerVerbosity, smartlogger.File, "/var/log/netsender/")
@ -263,8 +261,8 @@ func main() {
// loop in NetSender mode // loop in NetSender mode
for *useNetsender { for *useNetsender {
if err := sendTo(ns); err != nil { if err := sendTo(&ns); err != nil {
config.Logger.Log(progName, "Error", err.Error()) config.Logger.Log(progName, "Warning", err.Error())
time.Sleep(netSendRetryTime) time.Sleep(netSendRetryTime)
continue continue
} }
@ -273,7 +271,7 @@ func main() {
// vars changed // vars changed
vars, err := ns.Vars() vars, err := ns.Vars()
if err != nil { if err != nil {
config.Logger.Log(progName, "Error", err.Error()) config.Logger.Log(progName, "Warning", err.Error())
time.Sleep(netSendRetryTime) time.Sleep(netSendRetryTime)
continue continue
} }
@ -301,15 +299,9 @@ func main() {
stopRevid() stopRevid()
} }
// sendTo handles NetReceiver configuration and sends requested data to the cloud. // sendTo implements our main NetSender client and handles NetReceiver configuration
func sendTo(ns netsender.Sender) error { // (as distinct from httpSender which just sends video data).
if !ns.IsConfigured() { func sendTo(ns *netsender.Sender) error {
err := ns.Config()
if err != nil {
return err
}
}
// populate input values, if any // populate input values, if any
inputs := netsender.MakePins(ns.GetConfigParam("ip")) inputs := netsender.MakePins(ns.GetConfigParam("ip"))
for i, pin := range inputs { for i, pin := range inputs {