Skip to content

Commit

Permalink
v3.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jemu75 committed Apr 14, 2021
1 parent 4194e77 commit b68d3d7
Show file tree
Hide file tree
Showing 20 changed files with 40 additions and 23 deletions.
3 changes: 2 additions & 1 deletion public/cfg/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
},
"options": {
"maxChartPoints": 100,
"logBuffer": 500
"logBuffer": 500,
"debugLevel": 5
},
"theme": {
"dark": true,
Expand Down
25 changes: 18 additions & 7 deletions src/components/TemplSysmon.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@

<v-card-title class="text-truncate">
{{ vals.title }}
<v-spacer />
<jsonList
v-if="app.options.debugMode"
:item="item"
/>
</v-card-title>
<v-divider />
<v-card-subtitle>
Expand Down Expand Up @@ -85,7 +90,13 @@
</template>

<script>
import jsonList from '@/components/Jsonlist.vue'
export default {
components: {
jsonList
},
props: {
item: {
type: Object,
Expand All @@ -95,6 +106,12 @@
data: () => ({
name: 'sysmon',
app: {
options: {
updateProcess: false,
debugMode: false
}
},
setup: {
size: 'col-12 col-sm-12 col-md-6 col-lg-6',
status: {
Expand Down Expand Up @@ -139,12 +156,6 @@
restart: true,
update: true,
updateText: 'prüfe updates...',
app: {
options: {
updateProcess: false,
}
}
}),
watch: {
Expand Down Expand Up @@ -255,7 +266,7 @@
subText: subText[0] || '',
}
if(listItem.isBar && listItem.color != 'success') this.vals.status.color = el.color;
if(listItem.isBar && listItem.color != 'success') this.vals.status.color = listItem.color;
if(idx != -1) {
this.vals.list.splice(idx, 1, listItem);
Expand Down
14 changes: 8 additions & 6 deletions src/plugins/fhem.js
Original file line number Diff line number Diff line change
Expand Up @@ -704,20 +704,22 @@ export default class Fhem extends EventEmitter {
this.app.session.socket = null;

if(!this.app.session.restart) {
let msecs = this.app.session.restartCnt == 0 ? 0 : 3000;
let msecs = this.app.session.restartCnt == 0 ? 1 : 3000;

this.log = { type: 'intern', message: 'Restart-Sequence is started. (restart counter: ' + this.app.session.restartCnt + ' - restart on: '+ msecs + ' milliseconds)' , debugLevel: 5 };

this.app.session.restart = true;
setTimeout(() => {
this.app.session.restart = false;
this.app.session.restartCnt ++;
this.init()
}, msecs);
}

this.log = {
type: 'status',
message: 'Connection with FHEM was closed. Try to Reconnect in 3 seconds...',
debugLevel: 2
this.log = {
type: 'status',
message: 'Connection with FHEM was closed. Try to Reconnect in ' + (msecs / 1000) + ' seconds...',
debugLevel: 2
}
}
}

Expand Down
3 changes: 2 additions & 1 deletion www/fhemapp/cfg/config.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"options": {
"maxChartPoints": 100,
"logBuffer": 500
"logBuffer": 500,
"debugLevel": 5
},
"theme": {
"dark": true,
Expand Down
File renamed without changes.
1 change: 0 additions & 1 deletion www/fhemapp/css/chunk-45f3f6c7.e7a67bcf.css

This file was deleted.

1 change: 1 addition & 0 deletions www/fhemapp/css/chunk-4a62a958.b490d9b1.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b68d3d7

Please sign in to comment.