Compare commits

..

No commits in common. "4971ad9d42c7f9ad908d287f9abd7facf2f70e18" and "7dbcb18ebf36ff738472be995f88a26ea41cb4c5" have entirely different histories.

2 changed files with 4 additions and 10 deletions

View File

@ -19,7 +19,6 @@ package account
import ( import (
"regexp" "regexp"
"runtime"
"golang.org/x/crypto/argon2" "golang.org/x/crypto/argon2"
) )
@ -35,13 +34,13 @@ const (
ArgonKeySize = 32 ArgonKeySize = 32
ArgonSaltSize = 16 ArgonSaltSize = 16
ArgonMaxInstances = 16
UUIDSize = 16 UUIDSize = 16
TokenSize = 32 TokenSize = 32
) )
var ( var (
ArgonMaxInstances = runtime.NumCPU()
isValidUsername = regexp.MustCompile(`^\w{1,16}$`).MatchString isValidUsername = regexp.MustCompile(`^\w{1,16}$`).MatchString
semaphore = make(chan bool, ArgonMaxInstances) semaphore = make(chan bool, ArgonMaxInstances)
) )

View File

@ -21,11 +21,9 @@ import (
"database/sql" "database/sql"
"encoding/hex" "encoding/hex"
"fmt" "fmt"
_ "github.com/go-sql-driver/mysql"
"log" "log"
"os" "os"
"time"
_ "github.com/go-sql-driver/mysql"
) )
var handle *sql.DB var handle *sql.DB
@ -38,10 +36,7 @@ func Init(username, password, protocol, address, database string) error {
return fmt.Errorf("failed to open database connection: %s", err) return fmt.Errorf("failed to open database connection: %s", err)
} }
handle.SetMaxIdleConns(256) handle.SetMaxOpenConns(1000)
handle.SetMaxOpenConns(256)
handle.SetConnMaxIdleTime(time.Second * 30)
handle.SetConnMaxLifetime(time.Minute)
tx, err := handle.Begin() tx, err := handle.Begin()
if err != nil { if err != nil {