From 0f3a053d8f915b07edbe91ee89a54edab52ce15b Mon Sep 17 00:00:00 2001
From: Eric Anderson <eanders@microsoft.com>
Date: Sun, 13 Nov 2016 13:38:25 -0800
Subject: [PATCH] verbiage tweaks. also ngrok kill adjustments.

---
 src/client/dialogs/appSettingsDialog.tsx |  4 ++--
 src/server/botFrameworkService.ts        |  8 ++++----
 src/server/ngrok.ts                      | 15 ++++++++++++---
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/client/dialogs/appSettingsDialog.tsx b/src/client/dialogs/appSettingsDialog.tsx
index 8181a9ff9..b71f8ccd4 100644
--- a/src/client/dialogs/appSettingsDialog.tsx
+++ b/src/client/dialogs/appSettingsDialog.tsx
@@ -191,8 +191,8 @@ export class AppSettingsDialog extends React.Component<{}, {}> {
                         </ul>
                         <hr className='enu-navhdr' />
                         <div className={"emu-tab" + (this.currentTab === Tabs.ServiceUrl ? " emu-visible" : " emu-hidden")}>
-                            <div className='emu-dialog-text'>The Callback URL is where the bot you're communicating with sends reply messages.</div>
-                            <div className={'emu-dialog-text' + (this.serviceUrlReadOnly ? '' : ' emu-hidden')}>NOTE: ngrok is controlling the value of this field. Clear your ngrok path to regain control of this value.</div>
+                            <div className='emu-dialog-text'>The Callback URL is where the bot sends reply messages.</div>
+                            <div className={'emu-dialog-text' + (this.serviceUrlReadOnly ? '' : ' emu-hidden')}>Note: ngrok is currently in control of this field. Clear your ngrok path to regain control of it.</div>
                             <div className="input-group">
                                 <label className="form-label">
                                     Callback URL:
diff --git a/src/server/botFrameworkService.ts b/src/server/botFrameworkService.ts
index b524f0b4b..214542ed3 100644
--- a/src/server/botFrameworkService.ts
+++ b/src/server/botFrameworkService.ts
@@ -109,12 +109,12 @@ export class BotFrameworkService extends RestServer {
                     }, (err, url: string, inspectPort: string) => {
                         if (err) {
                             log.warn(`failed to start ngrok: ${err.message || err.msg}`);
-                            log.debug(`to configure ngrok`, log.makeLinkMessage('click here', 'emulator://appsettings?tab=NgrokConfig'));
+                            log.debug(log.makeLinkMessage('click here', 'emulator://appsettings?tab=NgrokConfig'), 'to configure ngrok');
                         } else {
-                            this.inspectUrl = `http://127.0.0.1:${inspectPort}`;
+                            this.inspectUrl = `http://localhost:${inspectPort}`;
                             this.ngrokServiceUrl = url;
                             log.debug(`ngrok listening on: ${url}`);
-                            log.debug('inspectorUrl:', log.makeLinkMessage(this.inspectUrl, this.inspectUrl));
+                            log.debug('ngrok inspector:', log.makeLinkMessage(this.inspectUrl, this.inspectUrl));
                         }
                         // Sync settings to client
                         getStore().dispatch({
@@ -136,7 +136,7 @@ export class BotFrameworkService extends RestServer {
                         log.debug('ngrok stopped');
                     startNgrok();
                     return true;
-                }) || startNgrok();
+                });
             } else {
                 ngrok.disconnect(prevServiceUrl, () => {
                     startNgrok();
diff --git a/src/server/ngrok.ts b/src/server/ngrok.ts
index 6b66ff716..83ba3b7da 100644
--- a/src/server/ngrok.ts
+++ b/src/server/ngrok.ts
@@ -255,13 +255,22 @@ export function disconnect(url, cb) {
 export function kill(cb) {
 	cb = cb || noop;
 	if (!ngrok) {
-		return cb(false);
+		cb(false);
+		return;
 	}
 	ngrok.on('exit', function () {
 		api = null;
 		tunnels = {};
 		emitter.emit('disconnect');
-		return cb(true);
+		cb(true);
 	});
-	return ngrok.kill();
+	try {
+		if (!ngrok.kill())
+			throw "err-cleanup";
+	} catch (e) {
+		api = null;
+		ngrok = null;
+		tunnels = {};
+		cb(false);
+	}
 }