squishy

Thu, 23 Mar 2023 12:14:53 +0000

author
Matthew Wild <mwild1@gmail.com>
date
Thu, 23 Mar 2023 12:14:53 +0000
changeset 172
2c17151ed21b
parent 171
433a1f36d0d3
child 174
662bd8c5ae28
permissions
-rw-r--r--

client: Fix timeout handling

Previously, the timeout handler would fire an error that would get caught and
logged by the timer code. However that error never reached the upper levels of
scansion, leading to the whole thing just hanging.

Now we just trigger resumption of the async runner, and throw the error from
there if we haven't received the stanza yet.

With this change, timeouts are now correctly handled and reported as failures.

74
b3f2711684a7 Add Makefile and other files for building
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
1 Main "main.lua"
b3f2711684a7 Add Makefile and other files for building
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
2
b3f2711684a7 Add Makefile and other files for building
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
3 Output "scansion.bin"
b3f2711684a7 Add Makefile and other files for building
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
4 Option "executable"
b3f2711684a7 Add Makefile and other files for building
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
5
b3f2711684a7 Add Makefile and other files for building
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
6 Module "scansion.async"
b3f2711684a7 Add Makefile and other files for building
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
7 Module "scansion.error"
b3f2711684a7 Add Makefile and other files for building
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
8 Module "scansion.parser"
171
433a1f36d0d3 client: Move some generic utility functions to a helpers module
Matthew Wild <mwild1@gmail.com>
parents: 139
diff changeset
9 Module "scansion.helpers"
74
b3f2711684a7 Add Makefile and other files for building
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
10 Module "scansion.iterators"
b3f2711684a7 Add Makefile and other files for building
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
11 Module "scansion.objects.client"
b3f2711684a7 Add Makefile and other files for building
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
12 Module "scansion.queue"
b3f2711684a7 Add Makefile and other files for building
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
13 Module "scansion.stanzacmp"
b3f2711684a7 Add Makefile and other files for building
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
14 Module "scansion.xml"
120
c35386e4b456 squishy: Add new modules 'console' and 'pretty'
Matthew Wild <mwild1@gmail.com>
parents: 74
diff changeset
15 Module "scansion.console"
c35386e4b456 squishy: Add new modules 'console' and 'pretty'
Matthew Wild <mwild1@gmail.com>
parents: 74
diff changeset
16 Module "scansion.pretty"
74
b3f2711684a7 Add Makefile and other files for building
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
17
121
b09433ea9b0c squishy: Add support for optionally building with bundled verse
Matthew Wild <mwild1@gmail.com>
parents: 120
diff changeset
18 if GetOption "with-verse" then
b09433ea9b0c squishy: Add support for optionally building with bundled verse
Matthew Wild <mwild1@gmail.com>
parents: 120
diff changeset
19 Module "verse"
b09433ea9b0c squishy: Add support for optionally building with bundled verse
Matthew Wild <mwild1@gmail.com>
parents: 120
diff changeset
20 end
139
70c7c015384a squishy: Add --with-server option to bundle server and deps
Matthew Wild <mwild1@gmail.com>
parents: 121
diff changeset
21
70c7c015384a squishy: Add --with-server option to bundle server and deps
Matthew Wild <mwild1@gmail.com>
parents: 121
diff changeset
22 if GetOption "with-server" then
70c7c015384a squishy: Add --with-server option to bundle server and deps
Matthew Wild <mwild1@gmail.com>
parents: 121
diff changeset
23 Module "scansion.serve"
70c7c015384a squishy: Add --with-server option to bundle server and deps
Matthew Wild <mwild1@gmail.com>
parents: 121
diff changeset
24 Module "net.http.server" "serve/net/http/server.lua"
70c7c015384a squishy: Add --with-server option to bundle server and deps
Matthew Wild <mwild1@gmail.com>
parents: 121
diff changeset
25 Module "net.http.parser" "serve/net/http/parser.lua"
70c7c015384a squishy: Add --with-server option to bundle server and deps
Matthew Wild <mwild1@gmail.com>
parents: 121
diff changeset
26 Module "net.http.codes" "serve/net/http/codes.lua"
70c7c015384a squishy: Add --with-server option to bundle server and deps
Matthew Wild <mwild1@gmail.com>
parents: 121
diff changeset
27 Module "util.cache" "serve/util/cache.lua"
70c7c015384a squishy: Add --with-server option to bundle server and deps
Matthew Wild <mwild1@gmail.com>
parents: 121
diff changeset
28 end

mercurial