Skip to content
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

Jump to bottom

fix: Existing Hooks are replaced with new ones on restart #33

Merged
merged 4 commits into from
May 28, 2023
Merged

fix: Existing Hooks are replaced with new ones on restart #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
43d9997
fix: Hooks should attempt to update if already exists
cbaker6 May 28, 2023
581f046
switch method to PUT
cbaker6 May 28, 2023
f2c9626
delete and put when already exists
cbaker6 May 28, 2023
fa7a4ea
delete then post
cbaker6 May 28, 2023
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
5 changes: 0 additions & 5 deletions Sources/App/entrypoint.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ enum Entrypoint {
let app = Application(env)

defer {
Task {
// This may not delete all because it's async
// Be sure to delete manually in dashboard
await deleteHooks(app)
}
app.shutdown()
}

Expand Down
8 changes: 8 additions & 0 deletions Sources/ParseServerSwift/Models/HookFunction.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,14 @@
if error.containedIn([.webhookError]) && method == .POST {
// swiftlint:disable:next line_length
configuration.logger.warning("Hook Function: \"\(String(describing: hookFunction))\"; warning: \(error); on server: \(parseServerURLString)")
try await Self.method(.DELETE,
path,
name: name,
parseServerURLStrings: parseServerURLStrings)
return try await Self.method(method,
path,
name: name,
parseServerURLStrings: parseServerURLStrings)

Check warning on line 69 in Sources/ParseServerSwift/Models/HookFunction.swift

View check run for this annotation

Codecov / codecov/patch

Sources/ParseServerSwift/Models/HookFunction.swift#L62-L69 

Added lines #L62 - L69 were not covered by tests
} else {
// swiftlint:disable:next line_length
configuration.logger.error("Could not \(method) Hook Function: \"\(String(describing: hookFunction))\"; error: \(error); on server: \(parseServerURLString)")
Expand Down
10 changes: 10 additions & 0 deletions Sources/ParseServerSwift/Models/HookTrigger.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,16 @@
if error.containedIn([.webhookError]) && method == .POST {
// swiftlint:disable:next line_length
configuration.logger.warning("Hook Trigger: \"\(String(describing: hookTrigger))\"; warning: \(error); on server: \(parseServerURLString)")
try await Self.method(.DELETE,
path,
className: className,
triggerName: triggerName,
parseServerURLStrings: parseServerURLStrings)
return try await Self.method(method,
path,
className: className,
triggerName: triggerName,
parseServerURLStrings: parseServerURLStrings)

Check warning on line 81 in Sources/ParseServerSwift/Models/HookTrigger.swift

View check run for this annotation

Codecov / codecov/patch

Sources/ParseServerSwift/Models/HookTrigger.swift#L72-L81 

Added lines #L72 - L81 were not covered by tests
} else {
// swiftlint:disable:next line_length
configuration.logger.error("Could not \(method) Hook Trigger: \"\(String(describing: hookTrigger))\"; error: \(error); on server: \(parseServerURLString)")
Expand Down