From 38b5c7266a14c34624bba532cb74d8b2ae46c726 Mon Sep 17 00:00:00 2001
From: Brian Goff <cpuguy83@gmail.com>
Date: Tue, 28 Apr 2015 08:43:04 -0400
Subject: [PATCH] Fix error message on firewalld init

If firewalld is not installed (or I suppose not running), firewalld was
producing an error in the daemon init logs, even though firewalld is not
required for iptables stuff to function.
The firewalld library code was also logging directly to logrus instead
of returning errors.

Moved logging code higher up in the stack and changed firewalld code to
return errors where appropriate.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
---
 daemon/networkdriver/bridge/driver.go |  4 +++-
 pkg/iptables/firewalld.go             | 19 +++++++------------
 pkg/iptables/firewalld_test.go        |  7 ++++++-
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/daemon/networkdriver/bridge/driver.go b/daemon/networkdriver/bridge/driver.go
index a324d6b6e..0a256b676 100644
--- a/daemon/networkdriver/bridge/driver.go
+++ b/daemon/networkdriver/bridge/driver.go
@@ -232,7 +232,9 @@ func InitDriver(config *Config) error {
 	}
 
 	if config.EnableIptables {
-		iptables.FirewalldInit()
+		if err := iptables.FirewalldInit(); err != nil {
+			logrus.Debugf("Error initializing firewalld: %v", err)
+		}
 	}
 
 	// Configure iptables for link support
diff --git a/pkg/iptables/firewalld.go b/pkg/iptables/firewalld.go
index 1c0cddb0f..89f123a1a 100644
--- a/pkg/iptables/firewalld.go
+++ b/pkg/iptables/firewalld.go
@@ -33,19 +33,18 @@ var (
 	onReloaded       []*func() // callbacks when Firewalld has been reloaded
 )
 
-func FirewalldInit() {
+func FirewalldInit() error {
 	var err error
 
-	connection, err = newConnection()
-
-	if err != nil {
-		logrus.Errorf("Failed to connect to D-Bus system bus: %s", err)
+	if connection, err = newConnection(); err != nil {
+		return fmt.Errorf("Failed to connect to D-Bus system bus: %v", err)
 	}
 	if connection != nil {
 		go signalHandler()
 	}
 
 	firewalldRunning = checkRunning()
+	return nil
 }
 
 // New() establishes a connection to the system bus.
@@ -146,19 +145,15 @@ func checkRunning() bool {
 		logrus.Infof("Firewalld running: %t", err == nil)
 		return err == nil
 	}
-	logrus.Info("Firewalld not running")
 	return false
 }
 
 // Firewalld's passthrough method simply passes args through to iptables/ip6tables
 func Passthrough(ipv IPV, args ...string) ([]byte, error) {
 	var output string
-
 	logrus.Debugf("Firewalld passthrough: %s, %s", ipv, args)
-	err := connection.sysobj.Call(dbusInterface+".direct.passthrough", 0, ipv, args).Store(&output)
-	if output != "" {
-		logrus.Debugf("passthrough output: %s", output)
+	if err := connection.sysobj.Call(dbusInterface+".direct.passthrough", 0, ipv, args).Store(&output); err != nil {
+		return nil, err
 	}
-
-	return []byte(output), err
+	return []byte(output), nil
 }
diff --git a/pkg/iptables/firewalld_test.go b/pkg/iptables/firewalld_test.go
index ff92657b1..547ba7e68 100644
--- a/pkg/iptables/firewalld_test.go
+++ b/pkg/iptables/firewalld_test.go
@@ -7,7 +7,12 @@ import (
 )
 
 func TestFirewalldInit(t *testing.T) {
-	FirewalldInit()
+	if !checkRunning() {
+		t.Skip("firewalld is not running")
+	}
+	if err := FirewalldInit(); err != nil {
+		t.Fatal(err)
+	}
 }
 
 func TestReloaded(t *testing.T) {