Merge pull request #35000 from nextcloud/bugfix/34959/fix-cron-warning-with-time-insensitive-jobs

Fix cron warning with time insensitive jobs
pull/32838/head
Joas Schilling 4 years ago committed by GitHub
commit ebbc0faf6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      apps/settings/src/components/BasicSettings/BackgroundJob.vue
  2. 4
      dist/settings-vue-settings-admin-basic-settings.js
  3. 2
      dist/settings-vue-settings-admin-basic-settings.js.map

@ -29,11 +29,11 @@
{{ t('settings', 'Last job execution ran {time}. Something seems wrong.', {time: relativeTime}) }}
</NcNoteCard>
<NcNoteCard v-else-if="longExecutionNotCron" type="warning">
<NcNoteCard v-else-if="longExecutionCron" type="warning">
{{ t('settings', "Some jobs have not been executed since {maxAgeRelativeTime}. Please consider increasing the execution frequency.", {maxAgeRelativeTime}) }}
</NcNoteCard>
<NcNoteCard v-else-if="longExecutionCron" type="warning">
<NcNoteCard v-else-if="longExecutionNotCron" type="warning">
{{ t('settings', "Some jobs have not been executed since {maxAgeRelativeTime}. Please consider switching to system cron.", {maxAgeRelativeTime}) }}
</NcNoteCard>
@ -138,7 +138,7 @@ export default {
return Date.now() / 1000 - this.cronMaxAge > 12 * 3600 && this.backgroundJobsMode !== 'cron'
},
longExecutionCron() {
return Date.now() / 1000 - this.cronMaxAge > 12 * 3600 && this.backgroundJobsMode === 'cron'
return Date.now() / 1000 - this.cronMaxAge > 24 * 3600 && this.backgroundJobsMode === 'cron'
},
},
methods: {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save