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 race condition in trigger disable #2858

Merged
merged 13 commits into from
Nov 25, 2020
Merged

Fix race condition in trigger disable #2858

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cefa454
Fix race condition in trigger disable
samtstern Nov 23, 2020
c36e3cb
Lint and comments
samtstern Nov 23, 2020
1fd6d9a
Fix tests
samtstern Nov 24, 2020
a607be8
Merge branch 'master' into ss-trigger-disable-race
samtstern Nov 24, 2020
4991923
Fix issue with function names
samtstern Nov 24, 2020
0bd9e80
Fix function URLs
samtstern Nov 24, 2020
426a9da
Fix http triggers
samtstern Nov 24, 2020
d258752
Fix test
samtstern Nov 24, 2020
3dc30d1
Fix everything
samtstern Nov 25, 2020
99d7455
Clean up
samtstern Nov 25, 2020
e72ddff
Fix PubSub Scheduled
samtstern Nov 25, 2020
8d1efb6
Almost forgot HTTP
samtstern Nov 25, 2020
e1852a3
No double logging
samtstern Nov 25, 2020
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
Prev Previous commit
Next Next commit
Fix PubSub Scheduled
  • Loading branch information
@samtstern
samtstern committed Nov 25, 2020
commit e72ddffcf9d145a55a0cd471b41eb5cfb51e8ee3
6 changes: 3 additions & 3 deletions src/emulator/functionsEmulator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ export class FunctionsEmulator implements EmulatorInstance {
break;
case Constants.SERVICE_PUBSUB:
added = await this.addPubsubTrigger(
this.args.projectId,
definition.name,
key,
definition.eventTrigger,
definition.schedule
Expand Down Expand Up @@ -572,7 +572,7 @@ export class FunctionsEmulator implements EmulatorInstance {
}

async addPubsubTrigger(
projectId: string,
triggerName: string,
key: string,
eventTrigger: EventTrigger,
schedule: EventSchedule | undefined
Expand All @@ -593,7 +593,7 @@ export class FunctionsEmulator implements EmulatorInstance {
// In production this topic looks like
// "firebase-schedule-{FUNCTION_NAME}-{DEPLOY-LOCATION}", we simply drop
// the deploy location to match as closely as possible.
topic = "firebase-schedule-" + key;
topic = "firebase-schedule-" + triggerName;
} else {
const resourceParts = resource.split("/");
topic = resourceParts[resourceParts.length - 1];
Expand Down