Skip to content

Spremenil lokacijo konstant iz main.go v consts.go. #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Drsoldier wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Spremenil lokacijo konstant iz main.go v consts.go. #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d42987e
Spremenil lokacijo konstant iz main.go v consts.go. client.go želi gi…
Drsoldier Aug 19, 2021
05d1f33
Merge branch 'ptr-geeks:develop' into develop
Drsoldier Aug 19, 2021
a33e944
Brez dockerfile-ov
Drsoldier Aug 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions server/cmd/ptrun-server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"syscall"
"time"

"github.com/ptr-geeks/ptrun/server/internal/consts"
"github.com/ptr-geeks/ptrun/server/internal/ws"
"go.uber.org/zap"
"goji.io"
"goji.io/pat"

"github.com/ptr-geeks/ptrun/server/internal/ws"
)

var (
Expand Down Expand Up @@ -46,12 +46,11 @@ func main() {
})

srv := &http.Server{
Handler: mux,
Addr: "0.0.0.0:8080",
// These should probably be moved under internal/const
WriteTimeout: 15 * time.Second,
ReadTimeout: 15 * time.Second,
IdleTimeout: 15 * time.Second,
Handler: mux,
Addr: "0.0.0.0:8080",
WriteTimeout: consts.HttpWriteTimeout,
ReadTimeout: consts.HttpReadTimeout,
IdleTimeout: consts.HttpIdleTimeout,
}

done := make(chan os.Signal, 1)
Expand Down
9 changes: 8 additions & 1 deletion server/internal/consts/consts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
package consts

import (
"time"
)

const (
ChanBufferSize = 200
ChanBufferSize = 200
HttpWriteTimeout = 15 * time.Second
HttpReadTimeout = 15 * time.Second
HttpIdleTimeout = 15 * time.Second
)
4 changes: 2 additions & 2 deletions server/internal/ws/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
)

const (
writeTimeout = 10 * time.Second
WebSocketwriteTimeout = 10 * time.Second
)

type clientImpl struct {
Expand Down Expand Up @@ -111,7 +111,7 @@ func (c *clientImpl) SendPump() {

for message := range c.send {
// So we don't wait for too long before we send
c.conn.SetWriteDeadline(time.Now().Add(writeTimeout))
c.conn.SetWriteDeadline(time.Now().Add(WebSocketwriteTimeout))

writer, err := c.conn.NextWriter(websocket.BinaryMessage)
if err != nil {
Expand Down