OceanSlim/grain
1
0
Fork 0
mirror of https://github.com/0ceanSlim/grain.git synced 2024-11-24 17:33:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

moved timeouts to config

Browse Source
This commit is contained in:
0ceanSlim 2024-08-08 08:40:23 -04:00
parent ea0a29d4b9
commit f5a0f6560d
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/types/serverConfig.go
View File

@ -6,7 +6,10 @@ type ServerConfig struct {
Database string `yaml:"database"` Database string `yaml:"database"`
} `yaml:"mongodb"` } `yaml:"mongodb"`
Server struct { Server struct {
Port string `yaml:"port"` Port string `yaml:"port"`
ReadTimeout int `yaml:"read_timeout"` // Timeout in seconds
WriteTimeout int `yaml:"write_timeout"` // Timeout in seconds
IdleTimeout int `yaml:"idle_timeout"` // Timeout in seconds
} `yaml:"server"` } `yaml:"server"`
RateLimit RateLimitConfig `yaml:"rate_limit"` RateLimit RateLimitConfig `yaml:"rate_limit"`
PubkeyWhitelist PubkeyWhitelistConfig `yaml:"pubkey_whitelist"` PubkeyWhitelist PubkeyWhitelistConfig `yaml:"pubkey_whitelist"`

31
main.go
View File

@ -62,9 +62,9 @@ func startServer(config *configTypes.ServerConfig, mux *http.ServeMux) {
server := &http.Server{ server := &http.Server{
Addr: config.Server.Port, Addr: config.Server.Port,
Handler: mux, Handler: mux,
ReadTimeout: 10 * time.Second, ReadTimeout: time.Duration(config.Server.ReadTimeout) * time.Second,
WriteTimeout: 10 * time.Second, WriteTimeout: time.Duration(config.Server.WriteTimeout) * time.Second,
IdleTimeout: 120 * time.Second, IdleTimeout: time.Duration(config.Server.IdleTimeout) * time.Second,
} }
fmt.Printf("Server is running on http://localhost%s\n", config.Server.Port) fmt.Printf("Server is running on http://localhost%s\n", config.Server.Port)
err := server.ListenAndServe() err := server.ListenAndServe()
@ -72,20 +72,21 @@ func startServer(config *configTypes.ServerConfig, mux *http.ServeMux) {
fmt.Println("Error starting server:", err) fmt.Println("Error starting server:", err)
} }
} }
var wsServer = &websocket.Server{ var wsServer = &websocket.Server{
Handshake: func(config *websocket.Config, r *http.Request) error { Handshake: func(config *websocket.Config, r *http.Request) error {
// Skip origin check // Skip origin check
return nil return nil
}, },
Handler: websocket.Handler(relay.WebSocketHandler), Handler: websocket.Handler(relay.WebSocketHandler),
} }
func ListenAndServe(w http.ResponseWriter, r *http.Request) { func ListenAndServe(w http.ResponseWriter, r *http.Request) {
if r.Header.Get("Upgrade") == "websocket" { if r.Header.Get("Upgrade") == "websocket" {
wsServer.ServeHTTP(w, r) wsServer.ServeHTTP(w, r)
} else if r.Header.Get("Accept") == "application/nostr+json" { } else if r.Header.Get("Accept") == "application/nostr+json" {
nip.RelayInfoHandler(w, r) nip.RelayInfoHandler(w, r)
} else { } else {
app.RootHandler(w, r) app.RootHandler(w, r)
} }
} }