diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 70f7938..ef0d1dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,6 +49,8 @@ jobs: uses: actions/setup-go@v4 with: go-version: "1.21" + cache: false + - name: Install dependencies (Ubuntu) if: matrix.os == 'linux' run: | diff --git a/client/main.go b/client/main.go index d5bbb2e..3ad420e 100644 --- a/client/main.go +++ b/client/main.go @@ -15,7 +15,7 @@ import ( "github.com/sqlrsync/sqlrsync.com/sync" ) -var VERSION = "0.0.9" +var VERSION = "0.0.10" var ( serverURL string verbose bool diff --git a/client/remote/client.go b/client/remote/client.go index 4e1d997..40b5e65 100644 --- a/client/remote/client.go +++ b/client/remote/client.go @@ -1141,7 +1141,7 @@ func (c *Client) pingLoop() { defer c.logger.Debug("Ping loop terminated") // Use longer ping interval in subscribe mode to accommodate hibernated connections - pingInterval := 5 * time.Second + pingInterval := 4 * time.Minute if c.config.Subscribe { pingInterval = 25 * time.Minute c.logger.Info("Subscribe mode: using 25-minute ping interval for hibernated connections") @@ -1173,13 +1173,7 @@ func (c *Client) pingLoop() { return } - // Use longer ping timeout in subscribe mode - pingTimeout := 10 * time.Second - if c.config.Subscribe { - pingTimeout = 30 * time.Second - } - - err := conn.WriteControl(websocket.PingMessage, nil, time.Now().Add(pingTimeout)) + err := conn.WriteControl(websocket.PingMessage, nil, time.Now().Add(5*time.Second)) if err != nil { c.logger.Error("Failed to send ping", zap.Error(err)) c.setError(err)