Skip to content

Commit

Permalink
Merge pull request #79 from ligato/pantheon-dev
Browse files Browse the repository at this point in the history
Pantheon dev
  • Loading branch information
rastislavs authored Aug 28, 2017
2 parents 0fbef4f + eb0a40a commit 5086be7
Show file tree
Hide file tree
Showing 54 changed files with 430 additions and 403 deletions.
2 changes: 1 addition & 1 deletion glide.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package: github.com/ligato/vpp-agent
import:
- package: github.com/ligato/cn-infra
version: 1504a973dbd7cc2d75ce705ba6fb008f907abfee
version: ae475c078bd9d772d2b8d18950951af0d3da0402
- package: github.com/wadey/gocovmerge
version: b5bfa59ec0adc420475f97f89b58045c721d761c
- package: github.com/onsi/gomega
Expand Down
14 changes: 9 additions & 5 deletions plugins/defaultplugins/publish.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,11 @@ func (plugin *Plugin) resyncIfStateEvents(keys []string) error {

_, _, found := plugin.swIfIndexes.LookupIdx(ifaceName)
if !found {
log.DefaultLogger().Debug("deleting obsolete status begin ", key)
err := plugin.Publish.Put(key, nil /*means delete*/)
log.DefaultLogger().Debug("deleting obsolete status end ", key, err)
err := plugin.PublishStatistics.Put(key, nil, /*means delete*/)
if err != nil {
return err
}
log.DefaultLogger().Debugf("Obsolete status for %v deleted", key)
} else {
log.DefaultLogger().WithField("ifaceName", ifaceName).Debug("interface status is needed")
}
Expand Down Expand Up @@ -92,9 +94,11 @@ func (plugin *Plugin) resyncBdStateEvents(keys []string) error {
}
_, _, found := plugin.bdIndexes.LookupIdx(bdName)
if !found {
log.DefaultLogger().Debug("deleting obsolete status begin ", key)
err := plugin.Publish.Put(key, nil)
log.DefaultLogger().Debug("deleting obsolete status end ", key, err)
if err != nil {
return err
}
log.DefaultLogger().Debugf("Obsolete status for %v deleted", key)
} else {
log.DefaultLogger().WithField("bdName", bdName).Debug("bridge domain status required")
}
Expand Down
18 changes: 9 additions & 9 deletions vendor/github.com/ligato/cn-infra/Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/ligato/cn-infra/datasync/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/ligato/cn-infra/examples/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5086be7

Please sign in to comment.