Merge pull request #1016 from ajaspers/mysql

Add support for Unix domain sockets.

conventional.yaml

@@ -663,8 +663,9 @@ datastore:
     mysql:
         enabled: false
         host: "localhost"
-        # port is unnecessary for connections via unix domain socket:
-        #port: 3306
+        port: 3306
+        # if socket-path is set, it will be used instead of host:port
+        #socket-path: "/var/run/mysqld/mysqld.sock"
         user: "oragono"
         password: "hunter2"
         history-database: "oragono_history"

irc/mysql/config.go

@@ -12,6 +12,7 @@ type Config struct {
 	Enabled         bool
 	Host            string
 	Port            int
+	SocketPath      string `yaml:"socket-path"`
 	User            string
 	Password        string
 	HistoryDatabase string `yaml:"history-database"`

irc/mysql/history.go

@@ -88,7 +88,9 @@ func (mysql *MySQL) getExpireTime() (expireTime time.Duration) {
 
 func (m *MySQL) Open() (err error) {
 	var address string
-	if m.config.Port != 0 {
+	if m.config.SocketPath != "" {
+		address = fmt.Sprintf("unix(%s)", m.config.SocketPath)
+	} else if m.config.Port != 0 {
 		address = fmt.Sprintf("tcp(%s:%d)", m.config.Host, m.config.Port)
 	}
 

oragono.yaml

@@ -684,8 +684,9 @@ datastore:
     mysql:
         enabled: false
         host: "localhost"
-        # port is unnecessary for connections via unix domain socket:
-        #port: 3306
+        port: 3306
+        # if socket-path is set, it will be used instead of host:port
+        #socket-path: "/var/run/mysqld/mysqld.sock"
         user: "oragono"
         password: "hunter2"
         history-database: "oragono_history"