andi/perfdb
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Activity

use port 17333 by default

Browse Source 
Not sure how this is supposed to work. To be able to support
Angular's development server and Spring as a standalone application
I had to hardcode the port Spring uses.
The problem is, that Angular runs on port 4200. Angular is compiled
to static files. So I cannot dynamically add the port that is
configured for Spring. But Angular has to be able to talk to the
Spring application.
I chose port 17333, because it does not collide with the standard
Tomcat port (8080).
This commit is contained in:
Andreas Huber
2020-03-12 19:54:13 +01:00
parent 9a311313ec
commit ec4f445b8d
5 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pdb-js/src/app/gallery-view/gallery-view.component.ts
View File

@@ -266,8 +266,8 @@ export class GalleryViewComponent implements OnInit {
that.progress = 100 * (that.totalNumberImages - that.splitByValuesQueue.length) / that.totalNumberImages; that.progress = 100 * (that.totalNumberImages - that.splitByValuesQueue.length) / that.totalNumberImages;
plotResponse.thumbnailUrl = "http://"+window.location.hostname+':8080/'+plotResponse.thumbnailUrl; plotResponse.thumbnailUrl = "http://"+window.location.hostname+':17333/'+plotResponse.thumbnailUrl;
plotResponse.imageUrl = "http://"+window.location.hostname+':8080/'+plotResponse.imageUrl; plotResponse.imageUrl = "http://"+window.location.hostname+':17333/'+plotResponse.imageUrl;
let galleryItem = new GalleryItem(splitByValue, plotResponse); let galleryItem = new GalleryItem(splitByValue, plotResponse);
that.galleryItems.push(galleryItem); that.galleryItems.push(galleryItem);
that.sortAndFilterGallery(); that.sortAndFilterGallery();

8
pdb-js/src/app/plot.service.ts
View File

@@ -40,7 +40,7 @@ export class PlotService {
} }
getTagFields(): Observable<Array<string>> { getTagFields(): Observable<Array<string>> {
return this.http.get<Array<string>>('//'+window.location.hostname+':8080/fields'); return this.http.get<Array<string>>('//'+window.location.hostname+':17333/fields');
} }
autocomplete(query: string, caretIndex: number, resultMode: ResultMode): Observable<AutocompleteResult> autocomplete(query: string, caretIndex: number, resultMode: ResultMode): Observable<AutocompleteResult>
@@ -51,17 +51,17 @@ export class PlotService {
.set('query', query) .set('query', query)
.set('resultMode', resultMode) .set('resultMode', resultMode)
}; };
return this.http.get<AutocompleteResult>('//'+window.location.hostname+':8080/autocomplete', options); return this.http.get<AutocompleteResult>('//'+window.location.hostname+':17333/autocomplete', options);
} }
sendPlotRequest(plotRequest: PlotRequest): Observable<PlotResponse>{ sendPlotRequest(plotRequest: PlotRequest): Observable<PlotResponse>{
//console.log("send plot request: "+ JSON.stringify(plotRequest)); //console.log("send plot request: "+ JSON.stringify(plotRequest));
return this.http.post<PlotResponse>('//'+window.location.hostname+':8080/plots', plotRequest); return this.http.post<PlotResponse>('//'+window.location.hostname+':17333/plots', plotRequest);
} }
getFilterDefaults(): Observable<FilterDefaults>{ getFilterDefaults(): Observable<FilterDefaults>{
return this.http.get<FilterDefaults>('//'+window.location.hostname+':8080/filters/defaults') return this.http.get<FilterDefaults>('//'+window.location.hostname+':17333/filters/defaults')
} }
splitQuery(query: string, splitBy:string) : Observable<Array<string>>{ splitQuery(query: string, splitBy:string) : Observable<Array<string>>{

2
pdb-js/src/app/visualization-page/visualization-page.component.ts
View File

@@ -133,7 +133,7 @@ export class VisualizationPageComponent implements OnInit {
this.plotService.sendPlotRequest(request).subscribe(function(plotResponse){ this.plotService.sendPlotRequest(request).subscribe(function(plotResponse){
console.log("response: " + JSON.stringify(plotResponse)); console.log("response: " + JSON.stringify(plotResponse));
that.plotView.imageUrl = "http://"+window.location.hostname+':8080/'+plotResponse.imageUrl; that.plotView.imageUrl = "http://"+window.location.hostname+':17333/'+plotResponse.imageUrl;
document.dispatchEvent(new Event("invadersPause", {})); document.dispatchEvent(new Event("invadersPause", {}));
}, },
error => { error => {

1
pdb-ui/src/main/resources/application-prod.properties
View File

@@ -1,5 +1,4 @@
#db.base=D:/ws/pdb/dataNew #db.base=D:/ws/pdb/dataNew
db.base=C:/pdb/dataNew db.base=C:/pdb/dataNew
server.port=17333
gnuplot.home=D:/ws/pdb/gnuplot-5.2 gnuplot.home=D:/ws/pdb/gnuplot-5.2
cache.images.duration.seconds=86400 cache.images.duration.seconds=86400

8
pdb-ui/src/main/resources/application.properties
View File

@@ -6,7 +6,13 @@ path.output=${base.dir}/out
logging.config=classpath:log4j2.xml logging.config=classpath:log4j2.xml
server.port=17333
spring.servlet.multipart.max-file-size=3000MB spring.servlet.multipart.max-file-size=3000MB
spring.servlet.multipart.max-request-size=3000MB spring.servlet.multipart.max-request-size=3000MB
#spring.resources.cache.cachecontrol.cache-private=true
#spring.resources.cache.cachecontrol.must-revalidate=true
#spring.resources.cache.cachecontrol.max-age=31536000
#spring.resources.static-locations=classpath:/static/