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.

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

Ngrok reporting made accurate #2113

Merged
merged 2 commits into from Mar 18, 2020
Merged

Ngrok reporting made accurate #2113

merged 2 commits into from Mar 18, 2020

Conversation

@srinaath
Copy link
Contributor

srinaath commented Mar 18, 2020

This PR makes sure Ngrok reporter reports accurately when Ngrok is used or not

Srinaath Ravichandran
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Srinaath Ravichandran
Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>

Changelog updated

Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>
Copy link
Contributor

tonyanziano left a comment

Awesome! 🚢

private isUsingNgrok(botUrl: string) {
const { bypassNgrokLocalhost, runNgrokAtStartup } = getSettings().framework;
const local = !botUrl || isLocalHostUrl(botUrl);
return runNgrokAtStartup || !local || (local && !bypassNgrokLocalhost);
}
Comment on lines +310 to +314

This comment has been minimized.

Copy link
@tonyanziano

tonyanziano Mar 18, 2020

Contributor

nice!

@srinaath srinaath merged commit 957d4ab into v4.8.1 Mar 18, 2020
2 checks passed
2 checks passed
Emulator-CI-PR #114154 succeeded
Details
license/cla All CLA requirements met.
Details
@tonyanziano tonyanziano deleted the srravich/bugfix/ngrok-report branch Mar 18, 2020
srinaath pushed a commit that referenced this pull request Mar 18, 2020
* Fixed missing item in File menu on Win / Lin. (#2100)

* Fixed missing item in File menu on Win / Lin.

* Fixed changelog entry PR #

* Bump version to 4.8.0 (#2101)

* Package updated

Signed-off-by: Srinaath Ravichandran <srravich@microsoft.com>

* Added missing icon file for Linux / Mac (#2104)

* Prevent passing props to activity middleware (#2105)

* Prevent passing props to activity middleware

* Package lock updated

* Changelog updated

* Corrected changelog

* Added tests to ensure restart bubble not present (#2107)

Should hide restart bubble if speech bot

Co-authored-by: Srinaath Ravichandran <srravich@microsoft.com>

* Fixed a bug that was causing a blank User 'id' field. (#2108)

* Fixed a bug that was causing a blank User 'id' field.

* Added extra assertion in tests.

* Ngrok Startup Options (#2111)

* Make sure ngrok running loop not hit everytime

* Ngrok reporting made accurate (#2113)

* Recator isUsingNgrok
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.