Merge branch 'consistent-logging' into 'v3'
Stop uvicorn.run disabling existing loggers Closes #284 See merge request openflexure/openflexure-microscope-server!228
This commit is contained in:
commit
e4ef8b2717
4 changed files with 115 additions and 15 deletions
|
|
@ -30,7 +30,10 @@
|
|||
</button>
|
||||
</div>
|
||||
<div>
|
||||
<a class="uk-button uk-button-default" :href="logFileURI" download
|
||||
<a
|
||||
class="uk-button uk-button-default"
|
||||
:href="logFileURI"
|
||||
download="openflexure_microscope.log"
|
||||
>Download Log File</a
|
||||
>
|
||||
</div>
|
||||
|
|
@ -125,9 +128,12 @@ export default {
|
|||
|
||||
return items;
|
||||
},
|
||||
logFileURI: function() {
|
||||
logURI: function() {
|
||||
return `${this.$store.getters.baseUri}/log/`;
|
||||
},
|
||||
logFileURI: function() {
|
||||
return `${this.$store.getters.baseUri}/logfile/`;
|
||||
},
|
||||
pagedItems: function() {
|
||||
let startIndex = (this.page - 1) * this.maxitems;
|
||||
return this.filteredItems.slice(startIndex, startIndex + this.maxitems);
|
||||
|
|
@ -150,7 +156,7 @@ export default {
|
|||
}
|
||||
},
|
||||
async updateLogs() {
|
||||
let response = await axios.get(this.logFileURI);
|
||||
let response = await axios.get(this.logURI);
|
||||
let lines = response.data.split("\n");
|
||||
let logs = [];
|
||||
let regexp = /\[(.+)\] \[(.+)\] (.*)$/;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue