do not await check env when activating edge extension

microsoft · Jun 22, 2018 · 62cf0f2 · 62cf0f2
1 parent 92637ec
commit 62cf0f2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/src/edge/edgeManager.ts b/src/edge/edgeManager.ts
@@ -160,25 +160,27 @@ export class EdgeManager {
             return;
         }
 
-        const folderPath = folder.uri.fsPath;
-        if (folder) {
-            const deploymentTemplate = path.join(folderPath, Constants.deploymentTemplate);
-            const envFile = path.join(folderPath, Constants.envFile);
-            if (await fse.exists(deploymentTemplate)) {
-                const templateJson = await fse.readJson(deploymentTemplate);
-                const runtimeSettings = templateJson.moduleContent.$edgeAgent["properties.desired"].runtime.settings;
-                const registries = runtimeSettings.registryCredentials;
-                if (registries) {
-                    await Utility.loadEnv(envFile);
-                    const expanded = Utility.expandEnv(JSON.stringify(registries, null, 2));
-                    const pattern: RegExp = new RegExp(/\$([a-zA-Z0-9_]+)|\${([a-zA-Z0-9_]+)}/g);
-                    const matchArr = expanded.match(pattern);
-                    if (matchArr && matchArr.length > 0) {
-                        await this.askEditEnv(envFile);
+        try {
+            const folderPath = folder.uri.fsPath;
+            if (folder) {
+                const deploymentTemplate = path.join(folderPath, Constants.deploymentTemplate);
+                const envFile = path.join(folderPath, Constants.envFile);
+                if (await fse.exists(deploymentTemplate)) {
+                    const templateJson = await fse.readJson(deploymentTemplate);
+                    const runtimeSettings = templateJson.moduleContent.$edgeAgent["properties.desired"].runtime.settings;
+                    const registries = runtimeSettings.registryCredentials;
+                    if (registries) {
+                        await Utility.loadEnv(envFile);
+                        const expanded = Utility.expandEnv(JSON.stringify(registries, null, 2));
+                        const pattern: RegExp = new RegExp(/\$([a-zA-Z0-9_]+)|\${([a-zA-Z0-9_]+)}/g);
+                        const matchArr = expanded.match(pattern);
+                        if (matchArr && matchArr.length > 0) {
+                            await this.askEditEnv(envFile);
+                        }
                     }
                 }
             }
-        }
+        } catch (err) {}
     }
 
     // TODO: The command is temperory for migration stage, will be removed later.

diff --git a/src/extension.ts b/src/extension.ts
@@ -90,7 +90,7 @@ export function activate(context: vscode.ExtensionContext) {
 
     const folders = vscode.workspace.workspaceFolders;
     if (folders && folders.length > 0) {
-        folders.forEach(async (value) => await edgeManager.checkRegistryEnv(value));
+        folders.forEach((value) => edgeManager.checkRegistryEnv(value));
     }
 }