ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-19 21:02:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6306 from uqbar-dao/i/6303/eyre-verbose

Browse Source 
eyre: add verbosity levels
This commit is contained in:
Ted Blackman 2023-03-16 13:39:44 -04:00 committed by GitHub
commit e17cb3e801
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 117 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/arvo/sys/lull.hoon
View File

@ -1426,6 +1426,9 @@
:: start responding negatively to cors requests from origin :: start responding negatively to cors requests from origin
:: ::
[%reject-origin =origin] [%reject-origin =origin]
:: %spew: set verbosity toggle
::
[%spew veb=@]
== ==
:: +origin: request origin as specified in an Origin header :: +origin: request origin as specified in an Origin header
:: ::

172
pkg/arvo/sys/vane/eyre.hoon
View File

@ -67,12 +67,8 @@
:: more structures :: more structures
:: ::
|% |%
++ axle +$ axle
$: :: date: date at which http-server's state was updated to this data structure $: %~2023.2.17
::
date=%~2022.7.26
:: server-state: state of inbound requests
::
=server-state =server-state
== ==
:: +server-state: state relating to open inbound HTTP connections :: +server-state: state relating to open inbound HTTP connections
@ -112,6 +108,9 @@
:: outgoing-duct: to unix :: outgoing-duct: to unix
:: ::
outgoing-duct=duct outgoing-duct=duct
:: verb: verbosity
::
verb=@
== ==
:: channel-request: an action requested on a channel :: channel-request: an action requested on a channel
:: ::
@ -584,7 +583,8 @@
[act [& secure address request] ~ 0] [act [& secure address request] ~ 0]
:: ::
=. connections.state =. connections.state
(~(put by connections.state) duct connection) %. (~(put by connections.state) duct connection)
(trace 2 |.("{<duct>} creating local"))
:: ::
:_ state :_ state
(subscribe-to-app app.act inbound-request.connection) (subscribe-to-app app.act inbound-request.connection)
@ -613,6 +613,7 @@
=/ connection=outstanding-connection =/ connection=outstanding-connection
[action [authenticated secure address request] ~ 0] [action [authenticated secure address request] ~ 0]
=. connections.state =. connections.state
:: XX pretty sure this is superfluous - done in +handle-response
(~(put by connections.state) duct connection) (~(put by connections.state) duct connection)
:: redirect to https if insecure, redirects enabled :: redirect to https if insecure, redirects enabled
:: and secure port live :: and secure port live
@ -864,6 +865,7 @@
%app %app
:_ state :_ state
:_ ~ :_ ~
%- (trace 1 |.("leaving subscription to {<app.action.u.connection>}"))
:* duct %pass /watch-response/[eyre-id] :* duct %pass /watch-response/[eyre-id]
%g %deal [our our] app.action.u.connection %g %deal [our our] app.action.u.connection
%leave ~ %leave ~
@ -1034,6 +1036,7 @@
=^ moz state =^ moz state
(handle-response response) (handle-response response)
[[give-session-tokens (weld moves moz)] state] [[give-session-tokens (weld moves moz)] state]
%- (trace 1 |.("{(trip i.channels)} discarding channel due to logout"))
=^ moz state =^ moz state
(discard-channel:by-channel i.channels |) (discard-channel:by-channel i.channels |)
$(moves (weld moves moz), channels t.channels) $(moves (weld moves moz), channels t.channels)
@ -1145,8 +1148,7 @@
:: POST methods are used solely for deleting channels :: POST methods are used solely for deleting channels
(on-put-request channel-id request) (on-put-request channel-id request)
:: ::
~& %session-not-a-put ((trace 0 |.("session not a put")) `state)
[~ state]
:: +on-cancel-request: cancels an ongoing subscription :: +on-cancel-request: cancels an ongoing subscription
:: ::
:: One of our long lived sessions just got closed. We put the associated :: One of our long lived sessions just got closed. We put the associated
@ -1156,15 +1158,15 @@
^- [(list move) server-state] ^- [(list move) server-state]
:: lookup the session id by duct :: lookup the session id by duct
:: ::
?~ maybe-channel-id=(~(get by duct-to-key.channel-state.state) duct) %- (trace 1 |.("{<duct>} moving channel to waiting state"))
~> %slog.[0 leaf+"eyre: no channel to cancel {<duct>}"]
[~ state]
:: ::
~> %slog.[0 leaf+"eyre: canceling {<duct>}"] ?~ maybe-channel-id=(~(get by duct-to-key.channel-state.state) duct)
((trace 0 |.("{<duct>} no channel to move")) `state)
:: ::
=/ maybe-session =/ maybe-session
(~(get by session.channel-state.state) u.maybe-channel-id) (~(get by session.channel-state.state) u.maybe-channel-id)
?~ maybe-session [~ state] ?~ maybe-session
((trace 1 |.("{<maybe-session>} session doesn't exist")) `state)
:: ::
=/ heartbeat-cancel=(list move) =/ heartbeat-cancel=(list move)
?~ heartbeat.u.maybe-session ~ ?~ heartbeat.u.maybe-session ~
@ -1461,6 +1463,7 @@
^- move ^- move
:^ duct %pass :^ duct %pass
(subscription-wire channel-id request-id ship app) (subscription-wire channel-id request-id ship app)
%- (trace 1 |.("subscribing to {<app>} on {<path>}"))
:* %g %deal [our ship] app :* %g %deal [our ship] app
`task:agent:gall`[%watch path] `task:agent:gall`[%watch path]
== ==
@ -1487,8 +1490,9 @@
:: the client sent us a weird request referring to a subscription :: the client sent us a weird request referring to a subscription
:: which isn't active. :: which isn't active.
:: ::
~& [%missing-subscription-in-unsubscribe channel-id subscription-id] %. $(requests t.requests)
$(requests t.requests) =* msg=tape "{(trip channel-id)} {<subscription-id>}"
(trace 0 |.("missing subscription in unsubscribe {msg}"))
:: ::
=. gall-moves =. gall-moves
:_ gall-moves :_ gall-moves
@ -1496,6 +1500,7 @@
=, u.maybe-subscription =, u.maybe-subscription
:^ duc %pass :^ duc %pass
(subscription-wire channel-id subscription-id.i.requests ship app) (subscription-wire channel-id subscription-id.i.requests ship app)
%- (trace 1 |.("leaving subscription to {<app>}"))
:* %g %deal [our ship] app :* %g %deal [our ship] app
`task:agent:gall`[%leave ~] `task:agent:gall`[%leave ~]
== ==
@ -1511,6 +1516,7 @@
$(requests t.requests) $(requests t.requests)
:: ::
%delete %delete
%- (trace 1 |.("{<channel-id>} discarding due to %delete PUT"))
=^ moves state =^ moves state
(discard-channel channel-id |) (discard-channel channel-id |)
=. gall-moves =. gall-moves
@ -1537,10 +1543,8 @@
(emit-event channel-id request-id sign) (emit-event channel-id request-id sign)
=/ =ship (slav %p i.extra) =/ =ship (slav %p i.extra)
=* app=term i.t.extra =* app=term i.t.extra
=/ =tape =* msg=tape "{(trip channel-id)} {(trip app)}"
%+ weld "eyre: removing watch for " %- (trace 0 |.("removing watch for non-existent channel {msg}"))
"non-existent channel {(trip channel-id)} on {(trip app)}"
%- (slog leaf+tape ~)
:_ state :_ state
:_ ~ :_ ~
^- move ^- move
@ -1628,11 +1632,15 @@
?& (gte num clog-threshold) ?& (gte num clog-threshold)
(lth (add last-ack.u.channel clog-timeout) now) (lth (add last-ack.u.channel clog-timeout) now)
== ==
~? clogged [%e %clogged channel-id request-id]
:: if we're clogged, or we ran into an event we can't serialize, :: if we're clogged, or we ran into an event we can't serialize,
:: kill this gall subscription. :: kill this gall subscription.
:: ::
=* kicking |(clogged ?=(~ json)) =* msg=tape "on {(trip channel-id)} for {(trip request-id)}"
=/ kicking=?
?: clogged
((trace 0 |.("clogged {msg}")) &)
?. ?=(~ json) |
((trace 0 |.("can't serialize event, kicking {msg}")) &)
=? moves kicking =? moves kicking
:_ moves :_ moves
::NOTE this shouldn't crash because we ::NOTE this shouldn't crash because we
@ -1640,6 +1648,7 @@
:: - only clog on %facts, which have a subscription associated, :: - only clog on %facts, which have a subscription associated,
:: - and already checked whether we still have that subscription. :: - and already checked whether we still have that subscription.
=+ (~(got by subscriptions.u.channel) request-id) =+ (~(got by subscriptions.u.channel) request-id)
%- (trace 1 |.("leaving subscription to {<app>}"))
:^ duct %pass :^ duct %pass
(subscription-wire channel-id request-id ship app) (subscription-wire channel-id request-id ship app)
[%g %deal [our ship] app %leave ~] [%g %deal [our ship] app %leave ~]
@ -1689,11 +1698,11 @@
^- (unit desk) ^- (unit desk)
=/ sub (~(get by subscriptions.channel) request-id) =/ sub (~(get by subscriptions.channel) request-id)
?~ sub ?~ sub
((slog leaf+"eyre: no subscription for request-id {<request-id>}" ~) ~) ((trace 0 |.("no subscription for request-id {(trip request-id)}")) ~)
=/ des=(unit (unit cage)) =/ des=(unit (unit cage))
(rof ~ %gd [our app.u.sub da+now] ~) (rof ~ %gd [our app.u.sub da+now] ~)
?. ?=([~ ~ *] des) ?. ?=([~ ~ *] des)
((slog leaf+"eyre: no desk for app {(trip app.u.sub)}" ~) ~) ((trace 0 |.("no desk for app {<app.u.sub>}")) ~)
`!<(=desk q.u.u.des) `!<(=desk q.u.u.des)
:: +channel-event-to-sign: attempt to recover a sign from a channel-event :: +channel-event-to-sign: attempt to recover a sign from a channel-event
:: ::
@ -1710,11 +1719,11 @@
=/ val=(unit (unit cage)) =/ val=(unit (unit cage))
(rof ~ %cb [our u.des da+now] /[have]) (rof ~ %cb [our u.des da+now] /[have])
?. ?=([~ ~ *] val) ?. ?=([~ ~ *] val)
((slog leaf+"eyre: no mark {(trip have)}" ~) ~) ((trace 0 |.("no mark {(trip have)}")) ~)
=+ !<(=dais:clay q.u.u.val) =+ !<(=dais:clay q.u.u.val)
=/ res (mule |.((vale:dais noun.event))) =/ res (mule |.((vale:dais noun.event)))
?: ?=(%| -.res) ?: ?=(%| -.res)
((slog leaf+"eyre: stale fact of mark {(trip have)}" ~) ~) ((trace 0 |.("stale fact of mark {(trip have)}")) ~)
`[%fact have p.res] `[%fact have p.res]
:: +sign-to-json: render sign from request-id as json channel event :: +sign-to-json: render sign from request-id as json channel event
:: ::
@ -1733,15 +1742,14 @@
?~ des [~ ~] ?~ des [~ ~]
:: ::
=* have=mark p.cage.sign =* have=mark p.cage.sign
=* desc=tape "from {(trip have)} to json"
=/ convert=(unit vase) =/ convert=(unit vase)
=/ cag=(unit (unit cage)) =/ cag=(unit (unit cage))
(rof ~ %cf [our u.des da+now] /[have]/json) (rof ~ %cf [our u.des da+now] /[have]/json)
?. ?=([~ ~ *] cag) ~ ?. ?=([~ ~ *] cag) ~
`q.u.u.cag `q.u.u.cag
?~ convert ?~ convert
((slog leaf+"eyre: no convert {desc}" ~) [~ ~]) ((trace 0 |.("no convert from {(trip have)} to json")) [~ ~])
~| "conversion failed {desc}" ~| "conversion failed from {(trip have)} to json"
[`[u.des have] `[%fact %json (slym u.convert q.q.cage.sign)]] [`[u.des have] `[%fact %json (slym u.convert q.q.cage.sign)]]
?~ jsyn ~ ?~ jsyn ~
%- some %- some
@ -1855,6 +1863,7 @@
%+ turn ~(tap by subscriptions.session) %+ turn ~(tap by subscriptions.session)
|= [request-id=@ud ship=@p app=term =path duc=^duct] |= [request-id=@ud ship=@p app=term =path duc=^duct]
^- move ^- move
%- (trace 1 |.("{<channel-id>} leaving subscription to {<app>}"))
:^ duc %pass :^ duc %pass
(subscription-wire channel-id request-id ship app) (subscription-wire channel-id request-id ship app)
[%g %deal [our ship] app %leave ~] [%g %deal [our ship] app %leave ~]
@ -1870,6 +1879,7 @@
?. ?=(%app -.action.connection) ?. ?=(%app -.action.connection)
~ ~
:_ ~ :_ ~
%- (trace 1 |.("leaving subscription to {<app.action.connection>}"))
:* duct %pass /watch-response/[eyre-id] :* duct %pass /watch-response/[eyre-id]
%g %deal [our our] app.action.connection %g %deal [our our] app.action.connection
%leave ~ %leave ~
@ -1897,8 +1907,7 @@
:: verify that this is a valid response on the duct :: verify that this is a valid response on the duct
:: ::
?~ connection-state=(~(get by connections.state) duct) ?~ connection-state=(~(get by connections.state) duct)
~& [%invalid-outstanding-connection duct] ((trace 0 |.("{<duct>} invalid outstanding connection")) `state)
[~ state]
:: ::
|^ ^- [(list move) server-state] |^ ^- [(list move) server-state]
:: ::
@ -1906,8 +1915,7 @@
:: ::
%start %start
?^ response-header.u.connection-state ?^ response-header.u.connection-state
~& [%http-multiple-start duct] ((trace 0 |.("{<duct>} error multiple start")) error-connection)
error-connection
:: if request was authenticated, extend the session & cookie's life :: if request was authenticated, extend the session & cookie's life
:: ::
=^ response-header sessions.authentication-state.state =^ response-header sessions.authentication-state.state
@ -1921,8 +1929,7 @@
?~ session-id=(session-id-from-request request.inbound) ?~ session-id=(session-id-from-request request.inbound)
:: cookies are the only auth method, so this is unexpected :: cookies are the only auth method, so this is unexpected
:: ::
~& [%e %authenticated-without-cookie] ((trace 0 |.("error authenticated without cookie")) no-op)
no-op
?. (~(has by sessions) u.session-id) ?. (~(has by sessions) u.session-id)
:: if the session has expired since the request was opened, :: if the session has expired since the request was opened,
:: tough luck, we don't create/revive sessions here :: tough luck, we don't create/revive sessions here
@ -1954,6 +1961,7 @@
:: ::
=. response-header.http-event response-header =. response-header.http-event response-header
=. connections.state =. connections.state
%- (trace 2 |.("{<duct>} start"))
%+ ~(put by connections.state) duct %+ ~(put by connections.state) duct
%_ connection %_ connection
response-header `response-header response-header `response-header
@ -1967,10 +1975,11 @@
:: ::
%continue %continue
?~ response-header.u.connection-state ?~ response-header.u.connection-state
~& [%http-continue-without-start duct] %. error-connection
error-connection (trace 0 |.("{<duct>} error continue without start"))
:: ::
=. connections.state =. connections.state
%- (trace 2 |.("{<duct>} continuing "))
%+ ~(jab by connections.state) duct %+ ~(jab by connections.state) duct
|= connection=outstanding-connection |= connection=outstanding-connection
=+ size=?~(data.http-event 0 p.u.data.http-event) =+ size=?~(data.http-event 0 p.u.data.http-event)
@ -1984,7 +1993,7 @@
%cancel %cancel
:: todo: log this differently from an ise. :: todo: log this differently from an ise.
:: ::
error-connection ((trace 1 |.("cancel http event")) error-connection)
== ==
:: ::
++ pass-response ++ pass-response
@ -1997,7 +2006,8 @@
:: remove all outstanding state for this connection :: remove all outstanding state for this connection
:: ::
=. connections.state =. connections.state
(~(del by connections.state) duct) %. (~(del by connections.state) duct)
(trace 2 |.("{<duct>} completed"))
state state
:: ::
++ error-connection ++ error-connection
@ -2015,6 +2025,8 @@
?. ?=(%app -.action.u.connection-state) ?. ?=(%app -.action.u.connection-state)
~ ~
:_ ~ :_ ~
%- %+ trace 1
|.("leaving subscription to {<app.action.u.connection-state>}")
:* duct %pass /watch-response/[eyre-id] :* duct %pass /watch-response/[eyre-id]
%g %deal [our our] app.action.u.connection-state %g %deal [our our] app.action.u.connection-state
%leave ~ %leave ~
@ -2124,6 +2136,11 @@
:- outgoing-duct.state :- outgoing-duct.state
=* ses sessions.authentication-state.state =* ses sessions.authentication-state.state
[%give %sessions (~(run in ~(key by ses)) (cury scot %uv))] [%give %sessions (~(run in ~(key by ses)) (cury scot %uv))]
::
++ trace
|= [pri=@ print=(trap tape)]
?: (lth verb.state pri) same
(slog leaf+"eyre: {(print)}" ~)
-- --
:: ::
++ forwarded-params ++ forwarded-params
@ -2426,6 +2443,10 @@
(~(del in approved) origin.task) (~(del in approved) origin.task)
(~(put in rejected) origin.task) (~(put in rejected) origin.task)
[~ http-server-gate] [~ http-server-gate]
::
%spew
=. verb.server-state.ax veb.task
`http-server-gate
== ==
:: ::
++ take ++ take
@ -2537,10 +2558,11 @@
?> ?=([%behn %wake *] sign) ?> ?=([%behn %wake *] sign)
?^ error.sign ?^ error.sign
[[duct %slip %d %flog %crud %wake u.error.sign]~ http-server-gate] [[duct %slip %d %flog %crud %wake u.error.sign]~ http-server-gate]
=/ discard-channel =* id i.t.t.wire
discard-channel:by-channel:(per-server-event event-args) %- %+ trace:(per-server-event event-args) 1
|.("{(trip id)} cancelling channel due to timeout")
=^ moves server-state.ax =^ moves server-state.ax
(discard-channel i.t.t.wire &) (discard-channel:by-channel:(per-server-event event-args) id &)
[moves http-server-gate] [moves http-server-gate]
:: ::
%heartbeat %heartbeat
@ -2613,27 +2635,61 @@
:: ::
++ load ++ load
=> |% => |%
++ axle-old +$ axle-any
%+ cork $% [%~2020.10.18 =server-state-0]
axle [%~2022.7.26 =server-state-0]
|= =axle [%~2023.2.17 =server-state]
axle(date %~2020.10.18) ==
-- +$ server-state-0
|= old=$%(axle axle-old) $: bindings=(list [=binding =duct =action])
=cors-registry
connections=(map duct outstanding-connection)
=authentication-state
=channel-state
domains=(set turf)
=http-config
ports=[insecure=@ud secure=(unit @ud)]
outgoing-duct=duct
==
--
|= old=axle-any
^+ ..^$ ^+ ..^$
::
?- -.old ?- -.old
%~2020.10.18 %~2020.10.18
%= $ =, server-state-0.old
date.old %~2022.7.26 %= ..^$
:: ax ^- axle
bindings.server-state.old :* %~2023.2.17
%+ insert-binding (insert-binding [[~ /~/name] outgoing-duct [%name ~]] bindings)
[[~ /~/name] outgoing-duct.server-state.old [%name ~]] cors-registry
bindings.server-state.old connections
== authentication-state
channel-state
domains
http-config
ports
outgoing-duct
0
== ==
:: ::
%~2022.7.26 %~2022.7.26
=, server-state-0.old
%= ..^$
ax ^- axle
:* %~2023.2.17
bindings
cors-registry
connections
authentication-state
channel-state
domains
http-config
ports
outgoing-duct
0
== ==
::
%~2023.2.17
:: enable https redirects if certificate configured :: enable https redirects if certificate configured
:: ::
=. redirect.http-config.server-state.old =. redirect.http-config.server-state.old