-
Notifications
You must be signed in to change notification settings - Fork 13.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FLINK-17130][web] Enable listing JM Logs and displaying Logs by file…
…name
- Loading branch information
vthinkxie
committed
Apr 14, 2020
1 parent
8127339
commit a68b809
Showing
13 changed files
with
215 additions
and
146 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 78 additions & 0 deletions
78
...eb/web-dashboard/src/app/pages/job-manager/log-detail/job-manager-log-detail.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; | ||
| import { ActivatedRoute } from '@angular/router'; | ||
| import { finalize } from 'rxjs/operators'; | ||
| import { JobManagerService } from 'services'; | ||
| import { MonacoEditorComponent } from 'share/common/monaco-editor/monaco-editor.component'; | ||
|
|
||
| @Component({ | ||
| selector: 'flink-job-manager-log-detail', | ||
| templateUrl: './job-manager-log-detail.component.html', | ||
| changeDetection: ChangeDetectionStrategy.OnPush, | ||
| host: { | ||
| '[class.full-screen]': 'isFullScreen' | ||
| }, | ||
| styleUrls: ['./job-manager-log-detail.component.less'] | ||
| }) | ||
| export class JobManagerLogDetailComponent implements OnInit { | ||
| logs = ''; | ||
| logName = ''; | ||
| downloadUrl = ''; | ||
| isLoading = false; | ||
| isFullScreen = false; | ||
| @ViewChild(MonacoEditorComponent) monacoEditorComponent: MonacoEditorComponent; | ||
| constructor( | ||
| private jobManagerService: JobManagerService, | ||
| private cdr: ChangeDetectorRef, | ||
| private activatedRoute: ActivatedRoute | ||
| ) {} | ||
|
|
||
| reload() { | ||
| this.isLoading = true; | ||
| this.cdr.markForCheck(); | ||
| this.jobManagerService | ||
| .loadLog(this.logName) | ||
| .pipe( | ||
| finalize(() => { | ||
| this.isLoading = false; | ||
| this.layoutEditor(); | ||
| this.cdr.markForCheck(); | ||
| }) | ||
| ) | ||
| .subscribe(data => { | ||
| this.logs = data.data; | ||
| this.downloadUrl = data.url; | ||
| }); | ||
| } | ||
|
|
||
| layoutEditor(): void { | ||
| setTimeout(() => this.monacoEditorComponent.layout()); | ||
| } | ||
|
|
||
| toggleFullScreen(fullScreen: boolean) { | ||
| this.isFullScreen = fullScreen; | ||
| this.layoutEditor(); | ||
| } | ||
|
|
||
| ngOnInit() { | ||
| this.logName = this.activatedRoute.snapshot.params.logName; | ||
| this.reload(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 0 additions & 26 deletions
26
...-runtime-web/web-dashboard/src/app/pages/job-manager/logs/job-manager-logs.component.less
This file was deleted.
Oops, something went wrong.
46 changes: 0 additions & 46 deletions
46
...untime-web/web-dashboard/src/app/pages/job-manager/stdout/job-manager-stdout.component.ts
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.