Skip to content

fix the log JSON structure of scheduled trigger logs #84

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
wants to merge 1 commit into
base: scheduled-triggers
Choose a base branch
from
Open

fix the log JSON structure of scheduled trigger logs #84

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion server/src-lib/Hasura/Eventing/HTTP.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,17 @@ data HTTPRespExtra (a :: TriggerTypes)
, _hreContext :: Maybe ExtraLogContext
}

$(J.deriveToJSON (J.aesonDrop 4 J.snakeCase){J.omitNothingFields=True} ''HTTPRespExtra)
instance J.ToJSON (HTTPRespExtra 'Scheduled) where
Copy link
Owner

@tirumaraiselvan tirumaraiselvan Apr 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to define this as instance J.ToJSON (HTTPRespExtra a) where to avoid duplicating ?

toJSON (HTTPRespExtra resp ctxt) = do
case resp of
Left errResp -> J.object ["response" J..= J.toJSON errResp, "context" J..= J.toJSON ctxt]
Right rsp -> J.object ["response" J..= J.toJSON rsp, "context" J..= J.toJSON ctxt]

instance J.ToJSON (HTTPRespExtra 'Event) where
toJSON (HTTPRespExtra resp ctxt) = do
case resp of
Left errResp -> J.object ["response" J..= J.toJSON errResp, "context" J..= J.toJSON ctxt]
Right rsp -> J.object ["response" J..= J.toJSON rsp, "context" J..= J.toJSON ctxt]

instance ToEngineLog (HTTPRespExtra 'Event) Hasura where
toEngineLog resp = (LevelInfo, eventTriggerLogType, J.toJSON resp)
Expand Down