Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 111

Fix timezone in MySQL connection string (#1818)

Browse source 
Fixes #1643
This commit is contained in:
Zachary Wasserman 2018-06-11 07:31:39 -07:00 committed by GitHub
parent 4ddb691524
commit f8796bc55b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
server/datastore/mysql/mysql.go
View file

@ -6,6 +6,7 @@ import (
"database/sql"
"fmt"
"io/ioutil"
"net/url"
"time"
"github.com/WatchBeam/clock"
@ -271,12 +272,14 @@ func registerTLS(config config.MysqlConfig) error {
// generateMysqlConnectionString returns a MySQL connection string using the
// provided configuration.
func generateMysqlConnectionString(conf config.MysqlConfig) string {
tz := url.QueryEscape("'-00:00'")
dsn := fmt.Sprintf(
"%s:%s@(%s)/%s?charset=utf8mb4&parseTime=true&loc=UTC&clientFoundRows=true&allowNativePasswords=true",
"%s:%s@(%s)/%s?charset=utf8mb4&parseTime=true&loc=UTC&time_zone=%s&clientFoundRows=true&allowNativePasswords=true",
conf.Username,
conf.Password,
conf.Address,
conf.Database,
tz,
)
if conf.TLSConfig != "" {