mirror of https://bitbucket.org/ausocean/av.git
cmd/revid-cli & revid: added TODO for the use of Run() instead of send in cmd/revid-cli/main.go. Fixed filename in revid/revid.go file header. Renamed ret to cfg in revid.Config(). Catching error from call to revid.Stop() in revid.Udate()
This commit is contained in:
parent
1cdbfa2c66
commit
bd2958ba4e
|
@ -286,6 +286,7 @@ func run(cfg revid.Config) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
for {
|
for {
|
||||||
|
// TODO(saxon): replace this call with call to ns.Run().
|
||||||
if err := send(&ns, rv); err != nil {
|
if err := send(&ns, rv); err != nil {
|
||||||
log.Log(logger.Error, pkg+"Run Failed. Retrying...", "error", err.Error())
|
log.Log(logger.Error, pkg+"Run Failed. Retrying...", "error", err.Error())
|
||||||
time.Sleep(netSendRetryTime)
|
time.Sleep(netSendRetryTime)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
NAME
|
NAME
|
||||||
r.go
|
revid.go
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
See Readme.md
|
See Readme.md
|
||||||
|
@ -329,9 +329,9 @@ func (r *Revid) IsRunning() bool {
|
||||||
|
|
||||||
func (r *Revid) Config() Config {
|
func (r *Revid) Config() Config {
|
||||||
r.mu.Lock()
|
r.mu.Lock()
|
||||||
ret := r.config
|
cfg := r.config
|
||||||
r.mu.Unlock()
|
r.mu.Unlock()
|
||||||
return ret
|
return cfg
|
||||||
}
|
}
|
||||||
|
|
||||||
// setIsRunning sets r.isRunning using b.
|
// setIsRunning sets r.isRunning using b.
|
||||||
|
@ -379,7 +379,9 @@ func (r *Revid) Stop() error {
|
||||||
|
|
||||||
func (r *Revid) Update(vars map[string]string) error {
|
func (r *Revid) Update(vars map[string]string) error {
|
||||||
if r.IsRunning() {
|
if r.IsRunning() {
|
||||||
r.Stop()
|
if err := r.Stop(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
//look through the vars and update revid where needed
|
//look through the vars and update revid where needed
|
||||||
for key, value := range vars {
|
for key, value := range vars {
|
||||||
|
|
Loading…
Reference in New Issue