Update embedded logging (#2337)

* update embedded logging * remove first do/retry
Azure · Feb 13, 2018 · 79c7c43 · 79c7c43
1 parent 468a0bb
commit 79c7c43
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/AzureFunctions.AngularClient/src/app/app.module.ts b/AzureFunctions.AngularClient/src/app/app.module.ts
@@ -24,6 +24,7 @@ import 'rxjs/add/operator/mergeMap';
 import 'rxjs/add/observable/of';
 import 'rxjs/add/operator/retry';
 import 'rxjs/add/operator/switchMap';
+import 'rxjs/add/operator/take';
 import 'rxjs/add/operator/takeUntil';
 import 'rxjs/add/observable/timer';
 import 'rxjs/add/observable/throw';

diff --git a/.../src/app/function/embedded/embedded-function-editor/embedded-function-editor.component.ts b/.../src/app/function/embedded/embedded-function-editor/embedded-function-editor.component.ts
@@ -137,8 +137,6 @@ export class EmbeddedFunctionEditorComponent implements OnInit, AfterContentInit
   setBottomBarState(expanded: boolean) {
     this.bottomBarExpanded = expanded;
 
-    console.log('editor bottom bar expanded - ' + this.bottomBarExpanded);
-
     setTimeout(() => {
       this.codeEditor.resize();
     });
@@ -170,22 +168,22 @@ export class EmbeddedFunctionEditorComponent implements OnInit, AfterContentInit
     if (result) {
       this._busyManager.setBusy();
       this._embeddedService.deleteFunction(this.resourceId)
-      .subscribe(r => {
+        .subscribe(r => {
           if (r.isSuccessful) {
-              this._busyManager.clearBusy();
-              this._broadcastService.broadcastEvent<TreeUpdateEvent>(BroadcastEvent.TreeUpdate, {
-                  resourceId: this.resourceId,
-                  operation: 'remove'
-              });
+            this._busyManager.clearBusy();
+            this._broadcastService.broadcastEvent<TreeUpdateEvent>(BroadcastEvent.TreeUpdate, {
+              resourceId: this.resourceId,
+              operation: 'remove'
+            });
           } else {
-              this._busyManager.clearBusy();
-              this._broadcastService.broadcast<ErrorEvent>(BroadcastEvent.Error, {
-                  message: r.error.message,
-                  errorId: r.error.errorId,
-                  resourceId: this.resourceId,
-                });
+            this._busyManager.clearBusy();
+            this._broadcastService.broadcast<ErrorEvent>(BroadcastEvent.Error, {
+              message: r.error.message,
+              errorId: r.error.errorId,
+              resourceId: this.resourceId,
+            });
           }
-      });
+        });
     }
   }
 }
diff --git a/.../app/function/embedded/embedded-function-logs-tab/embedded-function-logs-tab.component.ts b/.../app/function/embedded/embedded-function-logs-tab/embedded-function-logs-tab.component.ts
@@ -120,9 +120,6 @@ export class EmbeddedFunctionLogsTabComponent extends BottomTabComponent impleme
       .switchMap(t => {
         return this._cacheService.getArm(`${this.resourceId}/logs`, true);
       })
-      .catch(e => {
-        return Observable.of(null);
-      })
       .switchMap(r => {
         if (r) {
           const files: VfsObject[] = r.json();
@@ -140,6 +137,10 @@ export class EmbeddedFunctionLogsTabComponent extends BottomTabComponent impleme
         }
         return Observable.of(null);
       })
+      .do(null, e => {
+        return Observable.of(null);
+      })
+      .retry()
       .subscribe(r => {
         if (r) {
           this.logContent = r.text();