GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-25 21:39:25 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1016 from ajaspers/mysql

Browse Source 
Add support for Unix domain sockets.
This commit is contained in:
Shivaram Lingamneni 2020-05-16 22:19:43 -07:00 committed by GitHub
commit 1ab06949bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conventional.yaml
View File

@ -663,8 +663,9 @@ datastore:
mysql: mysql:
enabled: false enabled: false
host: "localhost" 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" user: "oragono"
password: "hunter2" password: "hunter2"
history-database: "oragono_history" history-database: "oragono_history"

1
irc/mysql/config.go
View File

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

4
irc/mysql/history.go
View File

@ -88,7 +88,9 @@ func (mysql *MySQL) getExpireTime() (expireTime time.Duration) {
func (m *MySQL) Open() (err error) { func (m *MySQL) Open() (err error) {
var address string 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) address = fmt.Sprintf("tcp(%s:%d)", m.config.Host, m.config.Port)
} }

5
oragono.yaml
View File

@ -684,8 +684,9 @@ datastore:
mysql: mysql:
enabled: false enabled: false
host: "localhost" 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" user: "oragono"
password: "hunter2" password: "hunter2"
history-database: "oragono_history" history-database: "oragono_history"