session: fix database connections with UNIX sockets (#73)

Co-authored-by: Joe Chen <jc@unknwon.io>
pgrok · Jul 25, 2023 · b854a8b · b854a8b
1 parent 95ab3bb
commit b854a8b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/cmd/pgrokd/main.go b/cmd/pgrokd/main.go
@@ -106,17 +106,31 @@ func startWebServer(config *conf.Config, db *database.DB) {
 	f.Use(flamego.Logger())
 	f.Use(flamego.Recovery())
 	f.Use(flamego.Renderer())
+
+	var postgresDSN string
+	// Check if the host is a UNIX domain socket
+	if strings.HasPrefix(config.Database.Host, "/") {
+		postgresDSN = fmt.Sprintf("postgres://%s:%s@localhost:%d/%s?host=%s",
+			config.Database.User,
+			config.Database.Password,
+			config.Database.Port,
+			config.Database.Database,
+			config.Database.Host,
+		)
+	} else {
+		postgresDSN = fmt.Sprintf("postgres://%s:%s@%s:%d/%s",
+			config.Database.User,
+			config.Database.Password,
+			config.Database.Host,
+			config.Database.Port,
+			config.Database.Database,
+		)
+	}
 	f.Use(session.Sessioner(
 		session.Options{
 			Initer: postgres.Initer(),
 			Config: postgres.Config{
-				DSN: fmt.Sprintf("postgres://%s:%s@%s:%d/%s",
-					config.Database.User,
-					config.Database.Password,
-					config.Database.Host,
-					config.Database.Port,
-					config.Database.Database,
-				),
+				DSN:       postgresDSN,
 				Table:     "sessions",
 				InitTable: true,
 			},

diff --git a/internal/database/db.go b/internal/database/db.go
@@ -52,7 +52,7 @@ func New(logWriter io.Writer, config *conf.Database) (*DB, error) {
 	)
 
 	dsn := fmt.Sprintf(
-		"user='%s' password='%s' host='%s' port='%d' dbname='%s' search_path='public' application_name='pgrokd'",
+		"user='%s' password='%s' host='%s' port='%d' dbname='%s' search_path='public' application_name='pgrokd' client_encoding=UTF8",
 		config.User, config.Password, config.Host, config.Port, config.Database,
 	)
 	db, err := gorm.Open(