diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-07-22 00:12:09 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-07-22 00:12:09 +0300 |
commit | ff23c54fd5a12cc1fc1bf0259fcd2cbe7c008303 (patch) | |
tree | b1efc3e8775f4bbd92ea91d141e8e3f24251af1e | |
parent | 14d7e4d20c4e17eba1805d36204392dc20d99d66 (diff) | |
parent | 4cc2f7411cbe032d39ab2a0d1baa64a7dbb47c64 (diff) | |
download | wekan-ff23c54fd5a12cc1fc1bf0259fcd2cbe7c008303.tar.gz wekan-ff23c54fd5a12cc1fc1bf0259fcd2cbe7c008303.tar.bz2 wekan-ff23c54fd5a12cc1fc1bf0259fcd2cbe7c008303.zip |
Merge branch 'pshunter-igbmc'
-rw-r--r-- | .meteor/packages | 1 | ||||
-rw-r--r-- | .meteor/versions | 1 | ||||
-rw-r--r-- | packages/wekan-ldap/package.js | 2 | ||||
-rw-r--r-- | packages/wekan-ldap/server/sync.js | 36 |
4 files changed, 24 insertions, 16 deletions
diff --git a/.meteor/packages b/.meteor/packages index ccbff63d..1c2cac57 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -94,3 +94,4 @@ lamhieu:unblock meteorhacks:aggregate@1.3.0 wekan-markdown konecty:mongo-counter +percolate:synced-cron diff --git a/.meteor/versions b/.meteor/versions index 13400796..e5fa94f0 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -137,6 +137,7 @@ peerlibrary:base-component@0.16.0 peerlibrary:blaze-components@0.15.1 peerlibrary:computed-field@0.9.0 peerlibrary:reactive-field@0.5.0 +percolate:synced-cron@1.3.2 promise@0.11.2 raix:eventemitter@0.1.3 raix:handlebar-helpers@0.2.5 diff --git a/packages/wekan-ldap/package.js b/packages/wekan-ldap/package.js index feda02e9..b6560854 100644 --- a/packages/wekan-ldap/package.js +++ b/packages/wekan-ldap/package.js @@ -21,7 +21,7 @@ Package.onUse(function(api) { api.use('accounts-base', 'server'); api.use('accounts-password', 'server'); - + api.use('percolate:synced-cron', 'server'); api.addFiles('client/loginHelper.js', 'client'); api.mainModule('server/index.js', 'server'); diff --git a/packages/wekan-ldap/server/sync.js b/packages/wekan-ldap/server/sync.js index 141ef349..dd3855d3 100644 --- a/packages/wekan-ldap/server/sync.js +++ b/packages/wekan-ldap/server/sync.js @@ -1,4 +1,5 @@ import _ from 'underscore'; +import SyncedCron from 'meteor/percolate:synced-cron'; import LDAP from './ldap'; import { log_debug, log_info, log_warn, log_error } from './logger'; @@ -418,30 +419,35 @@ function sync() { const jobName = 'LDAP_Sync'; const addCronJob = _.debounce(Meteor.bindEnvironment(function addCronJobDebounced() { + let sc=SyncedCron.SyncedCron; //Why ?? something must be wrong in the import if (LDAP.settings_get('LDAP_BACKGROUND_SYNC') !== true) { log_info('Disabling LDAP Background Sync'); - if (SyncedCron.nextScheduledAtDate(jobName)) { - SyncedCron.remove(jobName); + if (sc.nextScheduledAtDate(jobName)) { + sc.remove(jobName); } return; } - if (LDAP.settings_get('LDAP_BACKGROUND_SYNC_INTERVAL')) { - log_info('Enabling LDAP Background Sync'); - SyncedCron.add({ - name: jobName, - schedule: (parser) => parser.text(LDAP.settings_get('LDAP_BACKGROUND_SYNC_INTERVAL')), - job() { - sync(); - }, - }); - SyncedCron.start(); - } + log_info('Enabling LDAP Background Sync'); + sc.add({ + name: jobName, + schedule: function(parser) { + if (LDAP.settings_get('LDAP_BACKGROUND_SYNC_INTERVAL')) { + return parser.text(LDAP.settings_get('LDAP_BACKGROUND_SYNC_INTERVAL')); + } + else { + return parser.recur().on(0).minute(); + }}, + job: function() { + sync(); + }, + }); + sc.start(); + }), 500); Meteor.startup(() => { Meteor.defer(() => { - LDAP.settings_get('LDAP_BACKGROUND_SYNC', addCronJob); - LDAP.settings_get('LDAP_BACKGROUND_SYNC_INTERVAL', addCronJob); + if(LDAP.settings_get('LDAP_BACKGROUND_SYNC')){addCronJob();} }); }); |