Re-order checks

See: DataDog/dd-agent#3860 The default systemd socket is a private API not intended for external use. For this reason, processes must be run as root to access them, and therefore this is typically very unlikely to work as the agent does not run as root by default. We re-order the checks to try dbus first which is far more likely to succeed. This has the benefit of not causing extensive logging is syslog for failed connections due to insufficient permissions. Co-authored-by: Alistair Lynn <[email protected]>
danpalmer · Oct 29, 2019 · bbea2c6 · bbea2c6
1 parent 3a0c649
commit bbea2c6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/collector/corechecks/systemd/systemd.go b/pkg/collector/corechecks/systemd/systemd.go
@@ -233,9 +233,9 @@ func (c *SystemdCheck) getDbusConnection() (*dbus.Conn, error) {
 		if config.IsContainerized() {
 			conn, err = c.getPrivateSocketConnection("/host" + defaultPrivateSocket)
 		} else {
-			conn, err = c.getPrivateSocketConnection(defaultPrivateSocket)
+			conn, err = c.getSystemBusSocketConnection()
 			if err != nil {
-				conn, err = c.getSystemBusSocketConnection()
+				conn, err = c.getPrivateSocketConnection(defaultPrivateSocket)
 			}
 		}
 	}