Skip to content

Commit 032ceb6

Browse files
authored
fix: admin server dies silently by upgrading warp
* fix: admin server dies silently by upgrading warp Uses warp main branch yesodweb/wai@ad04121 since there's no release yet. * amend: use warp 3.4.14 for 3522917 Use a release instead of a git commit * amend: update cabal index so cabal build succeeds * chore: pin jose-jwt to build on CI
1 parent 71a8946 commit 032ceb6

7 files changed

Lines changed: 120 additions & 13 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. From versio
44

55
## Unreleased
66

7+
### Fixed
8+
9+
- Fix admin server dying silently by @Vlix, @mkleczek, @steve-chavez in #5012
10+
711
## [14.14] - 2026-06-29
812

913
### Fixed

cabal.project.freeze

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
index-state: hackage.haskell.org 2025-10-29T04:02:18Z
1+
index-state: hackage.haskell.org 2026-07-11T17:34:10Z

nix/overlays/haskell-packages.nix

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,61 @@ let
7070
}
7171
{ };
7272

73+
http2 =
74+
prev.callHackageDirect
75+
{
76+
pkg = "http2";
77+
ver = "5.4.0";
78+
sha256 = "sha256-PeEWVd61bQ8G7LvfLeXklzXqNJFaAjE2ecRMWJZESPE=";
79+
}
80+
{ };
81+
82+
http-semantics =
83+
prev.callHackageDirect
84+
{
85+
pkg = "http-semantics";
86+
ver = "0.4.0";
87+
sha256 = "sha256-rh0z51EKvsu5rQd5n2z3fSRjjEObouNZSBPO9NFYOF0=";
88+
}
89+
{ };
90+
91+
jose-jwt =
92+
prev.callHackageDirect
93+
{
94+
pkg = "jose-jwt";
95+
ver = "0.9.6";
96+
sha256 = "sha256-FhBz5wzyNrDvmjHWOeNAHuVMyJUVSlm+DeQQuITSjaI=";
97+
}
98+
{ };
99+
100+
time-manager =
101+
prev.callHackageDirect
102+
{
103+
pkg = "time-manager";
104+
ver = "0.2.4";
105+
sha256 = "sha256-sAt/331YLQ2IU3z90aKYSq1nxoazv87irsuJp7ZG3pw=";
106+
}
107+
{ };
108+
109+
network-run =
110+
prev.callHackageDirect
111+
{
112+
pkg = "network-run";
113+
ver = "0.5.0";
114+
sha256 = "sha256-vbXh+CzxDsGApjqHxCYf/ijpZtUCApFbkcF5gyN0THU=";
115+
}
116+
{ };
117+
118+
warp =
119+
lib.dontCheck
120+
(prev.callHackageDirect
121+
{
122+
pkg = "warp";
123+
ver = "3.4.14";
124+
sha256 = "sha256-RnoOUlC6dOP0sK/tYAJCX1oLzVFG1GILUY+yVbmvW8Y=";
125+
}
126+
{ });
127+
73128
# Downgrade hasql and related packages while we are still on GHC 9.4 for the static build.
74129
hasql = lib.dontCheck (lib.doJailbreak prev.hasql_1_6_4_4);
75130
hasql-dynamic-statements = lib.dontCheck prev.hasql-dynamic-statements_0_3_1_5;

postgrest.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ library
120120
, http-client >= 0.7.19 && < 0.8
121121
, http-types >= 0.12.2 && < 0.13
122122
, insert-ordered-containers >= 0.2.2 && < 0.3
123-
, jose-jwt >= 0.9.6 && < 0.11
123+
, jose-jwt >= 0.9.6 && < 0.10
124124
, lens >= 4.14 && < 5.4
125125
, lens-aeson >= 1.0.1 && < 1.3
126126
, mtl >= 2.2.2 && < 2.4
@@ -152,7 +152,7 @@ library
152152
-- for unix sockets; this is tested in test/io/test_io.py. See
153153
-- https://github.com/kazu-yamamoto/logger/commit/3a71ca70afdbb93d4ecf0083eeba1fbbbcab3fc3
154154
, wai-logger >= 2.4.0
155-
, warp >= 3.3.19 && < 3.5
155+
, warp >= 3.4.14 && < 3.5
156156
, stm >= 2.5 && < 3
157157
, stm-hamt >= 1.2 && < 2
158158
, focus >= 1.0 && < 2
@@ -273,7 +273,7 @@ test-suite spec
273273
, hspec-wai >= 0.10 && < 0.12
274274
, hspec-wai-json >= 0.10 && < 0.12
275275
, http-types >= 0.12.3 && < 0.13
276-
, jose-jwt >= 0.9.6 && < 0.11
276+
, jose-jwt >= 0.9.6 && < 0.10
277277
, lens >= 4.14 && < 5.4
278278
, lens-aeson >= 1.0.1 && < 1.3
279279
, monad-control >= 1.0.1 && < 1.1
@@ -316,7 +316,7 @@ test-suite observability
316316
, hspec-wai >= 0.10 && < 0.12
317317
, hspec-wai-json >= 0.10 && < 0.12
318318
, http-types >= 0.12.3 && < 0.13
319-
, jose-jwt >= 0.9.6 && < 0.11
319+
, jose-jwt >= 0.9.6 && < 0.10
320320
, postgrest
321321
, prometheus-client >= 1.1.1 && < 1.2.0
322322
, protolude >= 0.3.1 && < 0.4

stack.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,15 @@ nix:
99
pure: false
1010

1111
extra-deps:
12+
- auto-update-0.2.6
1213
- configurator-pg-0.2.11
1314
- fuzzyset-0.2.4
1415
- hasql-pool-1.0.1
15-
- jose-jwt-0.10.0
16+
- http-semantics-0.4.0
17+
- http2-5.4.0
18+
- jose-jwt-0.9.6
19+
- network-control-0.1.7
1620
- postgresql-libpq-0.10.1.0
1721
- streaming-commons-0.2.3.1
22+
- time-manager-0.3.2
23+
- warp-3.4.14

stack.yaml.lock

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44
# https://docs.haskellstack.org/en/stable/topics/lock_files
55

66
packages:
7+
- completed:
8+
hackage: auto-update-0.2.6@sha256:4adf0d523c8b8fbd53f32b79f115d5f304da7e1a2b35b66625497add8e9abbb5,1670
9+
pantry-tree:
10+
sha256: ce58248c2d6d83cf0dfcfe0aec20c238b279e70926f49108a38fe6917dc0c532
11+
size: 1105
12+
original:
13+
hackage: auto-update-0.2.6
714
- completed:
815
hackage: configurator-pg-0.2.11@sha256:de0c56386591e85159436b0af04a8f15a4f4e156354e99709676c2c2ee959505,2850
916
pantry-tree:
@@ -26,12 +33,33 @@ packages:
2633
original:
2734
hackage: hasql-pool-1.0.1
2835
- completed:
29-
hackage: jose-jwt-0.10.0@sha256:6ed175a01c721e317ceea15eb251a81de145c03711a977517935633a5cdec1d4,3546
36+
hackage: http-semantics-0.4.0@sha256:da8a98d542b2032cc12590847179577b0208a52bb3b9aa9a07c08d27d2a1714c,1513
37+
pantry-tree:
38+
sha256: d0e08875907c0fbff71813747fd93ce7bfd4e3d4a6b979df5c137430a9130f1d
39+
size: 1188
40+
original:
41+
hackage: http-semantics-0.4.0
42+
- completed:
43+
hackage: http2-5.4.0@sha256:1e9f6f5f32bfb3176136f35e041aa279bc456e81d4674ddaaeaa7c0d091be0c7,10624
44+
pantry-tree:
45+
sha256: 5c89815392d85d854efe75cf2279f58ff9f5e4b8fc1f83c55de93191edd128da
46+
size: 44864
47+
original:
48+
hackage: http2-5.4.0
49+
- completed:
50+
hackage: jose-jwt-0.9.6@sha256:cc234805da58fc75bc4c11af3db2dabf920f2c7d5d8b9a2b73bdb7c024b8d087,3557
3051
pantry-tree:
31-
sha256: 58649e68e2d1adb47d8ed8741bd27ac23a2f19e3ee62bc28a68ac8642b3e0858
32-
size: 1231
52+
sha256: 0bcaa403f0d6f3f7ad993d4d9e5d8f3dfd7e88c4e5e64b0219d7a1a03cb31e31
53+
size: 1288
3354
original:
34-
hackage: jose-jwt-0.10.0
55+
hackage: jose-jwt-0.9.6
56+
- completed:
57+
hackage: network-control-0.1.7@sha256:bfe3318c5cf6573dd585b126ec1197eae291a9a6df178006bf19da5c8aa14d68,1255
58+
pantry-tree:
59+
sha256: 6deb24c404f6e592be1f391f04c97f66169f97cacb0dd37403a6aa1e781846ef
60+
size: 619
61+
original:
62+
hackage: network-control-0.1.7
3563
- completed:
3664
hackage: postgresql-libpq-0.10.1.0@sha256:6b580c9d5068e78eecc13e655b2885c8e79cdacfca513c5d1e5a6b9dc61d9758,3166
3765
pantry-tree:
@@ -46,6 +74,20 @@ packages:
4674
size: 2374
4775
original:
4876
hackage: streaming-commons-0.2.3.1
77+
- completed:
78+
hackage: time-manager-0.3.2@sha256:74c16026c8592802d8a1cd9510c0223dad247b2a9ca791fa0153d243b56cc09e,1290
79+
pantry-tree:
80+
sha256: f282e2630df833732bde29944d4b0ac0d86399bcce80c1a3d523c2a5651b9e49
81+
size: 461
82+
original:
83+
hackage: time-manager-0.3.2
84+
- completed:
85+
hackage: warp-3.4.14@sha256:66b82af637f79ae4d39f7373b39491067f6d059b2581cb4caf18760f1d82e686,10066
86+
pantry-tree:
87+
sha256: 6db2e6d37acebd24d4e73d506481a4a2e0c53b35099756131a3852c8c8b84b45
88+
size: 4175
89+
original:
90+
hackage: warp-3.4.14
4991
snapshots:
5092
- completed:
5193
sha256: 238fa745b64f91184f9aa518fe04bdde6552533d169b0da5256670df83a0f1a9

test/memory/memory-tests.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ jsonKeyTest "10M" "POST" "/rpc/leak?columns=blob" "32M"
110110
jsonKeyTest "10M" "POST" "/leak?columns=blob" "32M"
111111
jsonKeyTest "10M" "PATCH" "/leak?id=eq.1&columns=blob" "50M"
112112

113-
jsonKeyTest "50M" "POST" "/rpc/leak?columns=blob" "73M"
114-
jsonKeyTest "50M" "POST" "/leak?columns=blob" "73M"
115-
jsonKeyTest "50M" "PATCH" "/leak?id=eq.1&columns=blob" "73M"
113+
jsonKeyTest "50M" "POST" "/rpc/leak?columns=blob" "77M"
114+
jsonKeyTest "50M" "POST" "/leak?columns=blob" "77M"
115+
jsonKeyTest "50M" "PATCH" "/leak?id=eq.1&columns=blob" "77M"
116116

117117
postJsonArrayTest "1000" "/perf_articles?columns=id,body" "21M"
118118
postJsonArrayTest "10000" "/perf_articles?columns=id,body" "22M"

0 commit comments

Comments
 (0)