Merge pull request #34 from thisisommore/thisisommore/issue23

Gracefully reconnect to socket on error, fix #23

main.go

@@ -8,6 +8,7 @@ import (
 	"os/exec"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/events"
@@ -126,18 +127,27 @@ func handleUfwRule(ch <-chan ufwEvent) {
 	}
 }
 
-func main() {
-	ctx := context.Background()
+func createClient() *client.Client {
 	cli, err := client.NewClientWithOpts(client.FromEnv)
 	if err != nil {
 		panic(err)
 	}
+	return cli
+}
 
+func addFilters(cli *client.Client, ctx *context.Context) (<-chan events.Message, <-chan error) {
+	_, cancelContext := context.WithCancel(*ctx)
+	cancelContext()
 	filter := filters.NewArgs()
 	filter.Add("type", "container")
 	filter.Add("type", "network")
+	return cli.Events(*ctx, types.EventsOptions{Filters: filter})
+}
 
-	messages, errors := cli.Events(ctx, types.EventsOptions{Filters: filter})
+func main() {
+	cli := createClient()
+	ctx := context.Background()
+	messages, errors := addFilters(cli, &ctx)
 
 	ch := make(chan ufwEvent)
 	go handleUfwRule(ch)
@@ -160,6 +170,10 @@ func main() {
 		case err := <-errors:
 			if err != nil {
 				fmt.Println("ufw-docker-automated: Received an error:", err)
+				time.Sleep(3 * time.Second)
+				fmt.Println("ufw-docker-automated: reconnecing")
+				cli = createClient()
+				messages, errors = addFilters(cli, &ctx)
 			}
 		}
 	}