From: Florian Forster <octo@collectd.org>
Date: Tue, 5 Dec 2017 06:33:18 +0000 (+0100)
Subject: Merge branch 'collectd-5.8'
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=8e5e2e927f9cf051ef210473b1b48ff62d81f585;p=collectd.git

Merge branch 'collectd-5.8'
---

8e5e2e927f9cf051ef210473b1b48ff62d81f585
diff --cc src/utils_ovs.c
index 2df9f2b0,4f487550..b3ce056d
--- a/src/utils_ovs.c
+++ b/src/utils_ovs.c
@@@ -757,11 -760,12 +758,11 @@@ static void ovs_db_reconnect(ovs_db_t *
      }
      if (connect(sock, rp->ai_addr, rp->ai_addrlen) < 0) {
        close(sock);
 -      sstrerror(errno, errbuff, sizeof(errbuff));
 -      OVS_DEBUG("connect(): %s [family=%d]", errbuff, rp->ai_family);
 +      OVS_DEBUG("connect(): %s [family=%d]", STRERRNO, rp->ai_family);
      } else {
        /* send notification to event thread */
-       ovs_db_event_post(pdb, OVS_DB_EVENT_CONN_ESTABLISHED);
        pdb->sock = sock;
+       ovs_db_event_post(pdb, OVS_DB_EVENT_CONN_ESTABLISHED);
        break;
      }
    }