github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up error logs.

Browse Source 
Use %v for errors, tidy some messages, make error messages start lowe-case
(as per go guidelines).  Just accumulated nits.
This commit is contained in:
Tim Hockin
2014-11-20 18:00:36 +08:00
parent c688bd402f
commit ea960711ff
53 changed files with 163 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/util/iptables/iptables.go
View File

@@ -89,7 +89,7 @@ func (runner *runner) EnsureChain(table Table, chain Chain) (bool, error) {
return true, nil
}
}
return false, fmt.Errorf("error creating chain %q: %s: %s", chain, err, out)
return false, fmt.Errorf("error creating chain %q: %v: %s", chain, err, out)
}
return false, nil
}
@@ -103,7 +103,7 @@ func (runner *runner) FlushChain(table Table, chain Chain) error {
out, err := runner.run(opFlushChain, fullArgs)
if err != nil {
return fmt.Errorf("error flushing chain %q: %s: %s", chain, err, out)
return fmt.Errorf("error flushing chain %q: %v: %s", chain, err, out)
}
return nil
}
@@ -124,7 +124,7 @@ func (runner *runner) EnsureRule(table Table, chain Chain, args ...string) (bool
}
out, err := runner.run(opAppendRule, fullArgs)
if err != nil {
return false, fmt.Errorf("error appending rule: %s: %s", err, out)
return false, fmt.Errorf("error appending rule: %v: %s", err, out)
}
return false, nil
}
@@ -145,7 +145,7 @@ func (runner *runner) DeleteRule(table Table, chain Chain, args ...string) error
}
out, err := runner.run(opDeleteRule, fullArgs)
if err != nil {
return fmt.Errorf("error deleting rule: %s: %s", err, out)
return fmt.Errorf("error deleting rule: %v: %s", err, out)
}
return nil
}
@@ -191,7 +191,7 @@ func (runner *runner) checkRule(table Table, chain Chain, args ...string) (bool,
func (runner *runner) checkRuleWithoutCheck(table Table, chain Chain, args ...string) (bool, error) {
out, err := runner.exec.Command("iptables-save", "-t", string(table)).CombinedOutput()
if err != nil {
return false, fmt.Errorf("error checking rule: %s", err)
return false, fmt.Errorf("error checking rule: %v", err)
}
argset := util.NewStringSet(args...)
@@ -225,7 +225,7 @@ func (runner *runner) checkRuleUsingCheck(args []string) (bool, error) {
return false, nil
}
}
return false, fmt.Errorf("error checking rule: %s: %s", err, out)
return false, fmt.Errorf("error checking rule: %v: %s", err, out)
}
type operation string
@@ -263,7 +263,7 @@ func extractIptablesVersion(str string) (int, int, int, error) {
versionMatcher := regexp.MustCompile("v([0-9]+)\\.([0-9]+)\\.([0-9]+)")
result := versionMatcher.FindStringSubmatch(str)
if result == nil {
return 0, 0, 0, fmt.Errorf("No iptables version found in string: %s", str)
return 0, 0, 0, fmt.Errorf("no iptables version found in string: %s", str)
}
v1, err := strconv.Atoi(result[1])

18
pkg/util/iptables/iptables_test.go
View File

@@ -55,7 +55,7 @@ func testEnsureChain(t *testing.T, protocol Protocol) {
// Success.
exists, err := runner.EnsureChain(TableNAT, Chain("FOOBAR"))
if err != nil {
t.Errorf("expected success, got %+v", err)
t.Errorf("expected success, got %v", err)
}
if exists {
t.Errorf("expected exists = false")
@@ -70,7 +70,7 @@ func testEnsureChain(t *testing.T, protocol Protocol) {
// Exists.
exists, err = runner.EnsureChain(TableNAT, Chain("FOOBAR"))
if err != nil {
t.Errorf("expected success, got %+v", err)
t.Errorf("expected success, got %v", err)
}
if !exists {
t.Errorf("expected exists = true")
@@ -109,7 +109,7 @@ func TestFlushChain(t *testing.T) {
// Success.
err := runner.FlushChain(TableNAT, Chain("FOOBAR"))
if err != nil {
t.Errorf("expected success, got %+v", err)
t.Errorf("expected success, got %v", err)
}
if fcmd.CombinedOutputCalls != 1 {
t.Errorf("expected 1 CombinedOutput() call, got %d", fcmd.CombinedOutputCalls)
@@ -144,7 +144,7 @@ func TestEnsureRuleAlreadyExists(t *testing.T) {
runner := New(&fexec, ProtocolIpv4)
exists, err := runner.EnsureRule(TableNAT, ChainOutput, "abc", "123")
if err != nil {
t.Errorf("expected success, got %+v", err)
t.Errorf("expected success, got %v", err)
}
if !exists {
t.Errorf("expected exists = true")
@@ -180,7 +180,7 @@ func TestEnsureRuleNew(t *testing.T) {
runner := New(&fexec, ProtocolIpv4)
exists, err := runner.EnsureRule(TableNAT, ChainOutput, "abc", "123")
if err != nil {
t.Errorf("expected success, got %+v", err)
t.Errorf("expected success, got %v", err)
}
if exists {
t.Errorf("expected exists = false")
@@ -270,7 +270,7 @@ func TestDeleteRuleAlreadyExists(t *testing.T) {
runner := New(&fexec, ProtocolIpv4)
err := runner.DeleteRule(TableNAT, ChainOutput, "abc", "123")
if err != nil {
t.Errorf("expected success, got %+v", err)
t.Errorf("expected success, got %v", err)
}
if fcmd.CombinedOutputCalls != 2 {
t.Errorf("expected 2 CombinedOutput() call, got %d", fcmd.CombinedOutputCalls)
@@ -303,7 +303,7 @@ func TestDeleteRuleNew(t *testing.T) {
runner := New(&fexec, ProtocolIpv4)
err := runner.DeleteRule(TableNAT, ChainOutput, "abc", "123")
if err != nil {
t.Errorf("expected success, got %+v", err)
t.Errorf("expected success, got %v", err)
}
if fcmd.CombinedOutputCalls != 3 {
t.Errorf("expected 3 CombinedOutput() calls, got %d", fcmd.CombinedOutputCalls)
@@ -488,7 +488,7 @@ COMMIT
runner := &runner{exec: &fexec}
exists, err := runner.checkRuleWithoutCheck(TableNAT, ChainPrerouting, "-m", "addrtype", "-j", "DOCKER", "--dst-type", "LOCAL")
if err != nil {
t.Errorf("expected success, got %+v", err)
t.Errorf("expected success, got %v", err)
}
if !exists {
t.Errorf("expected exists = true")
@@ -526,7 +526,7 @@ COMMIT
runner := &runner{exec: &fexec}
exists, err := runner.checkRuleWithoutCheck(TableNAT, ChainPrerouting, "-m", "addrtype", "-j", "DOCKER")
if err != nil {
t.Errorf("expected success, got %+v", err)
t.Errorf("expected success, got %v", err)
}
if exists {
t.Errorf("expected exists = false")