Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-17 16:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'pshunter-igbmc'

Browse source
This commit is contained in:
Lauri Ojansivu 2019-07-22 00:12:09 +03:00
commit ff23c54fd5
4 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.meteor/packages
View file

@ -94,3 +94,4 @@ lamhieu:unblock
meteorhacks:aggregate@1.3.0 meteorhacks:aggregate@1.3.0
wekan-markdown wekan-markdown
konecty:mongo-counter konecty:mongo-counter
percolate:synced-cron

1
.meteor/versions
View file

@ -137,6 +137,7 @@ peerlibrary:base-component@0.16.0
peerlibrary:blaze-components@0.15.1 peerlibrary:blaze-components@0.15.1
peerlibrary:computed-field@0.9.0 peerlibrary:computed-field@0.9.0
peerlibrary:reactive-field@0.5.0 peerlibrary:reactive-field@0.5.0
percolate:synced-cron@1.3.2
promise@0.11.2 promise@0.11.2
raix:eventemitter@0.1.3 raix:eventemitter@0.1.3
raix:handlebar-helpers@0.2.5 raix:handlebar-helpers@0.2.5

2
packages/wekan-ldap/package.js
View file

@ -21,7 +21,7 @@ Package.onUse(function(api) {
api.use('accounts-base', 'server'); api.use('accounts-base', 'server');
api.use('accounts-password', 'server'); api.use('accounts-password', 'server');
api.use('percolate:synced-cron', 'server');
api.addFiles('client/loginHelper.js', 'client'); api.addFiles('client/loginHelper.js', 'client');
api.mainModule('server/index.js', 'server'); api.mainModule('server/index.js', 'server');

26
packages/wekan-ldap/server/sync.js
View file

@ -1,4 +1,5 @@
import _ from 'underscore'; import _ from 'underscore';
import SyncedCron from 'meteor/percolate:synced-cron';
import LDAP from './ldap'; import LDAP from './ldap';
import { log_debug, log_info, log_warn, log_error } from './logger'; import { log_debug, log_info, log_warn, log_error } from './logger';
@ -418,30 +419,35 @@ function sync() {
const jobName = 'LDAP_Sync'; const jobName = 'LDAP_Sync';
const addCronJob = _.debounce(Meteor.bindEnvironment(function addCronJobDebounced() { 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) { if (LDAP.settings_get('LDAP_BACKGROUND_SYNC') !== true) {
log_info('Disabling LDAP Background Sync'); log_info('Disabling LDAP Background Sync');
if (SyncedCron.nextScheduledAtDate(jobName)) { if (sc.nextScheduledAtDate(jobName)) {
SyncedCron.remove(jobName); sc.remove(jobName);
} }
return; return;
} }
if (LDAP.settings_get('LDAP_BACKGROUND_SYNC_INTERVAL')) {
log_info('Enabling LDAP Background Sync'); log_info('Enabling LDAP Background Sync');
SyncedCron.add({ sc.add({
name: jobName, name: jobName,
schedule: (parser) => parser.text(LDAP.settings_get('LDAP_BACKGROUND_SYNC_INTERVAL')), schedule: function(parser) {
job() { 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(); sync();
}, },
}); });
SyncedCron.start(); sc.start();
}
}), 500); }), 500);
Meteor.startup(() => { Meteor.startup(() => {
Meteor.defer(() => { Meteor.defer(() => {
LDAP.settings_get('LDAP_BACKGROUND_SYNC', addCronJob); if(LDAP.settings_get('LDAP_BACKGROUND_SYNC')){addCronJob();}
LDAP.settings_get('LDAP_BACKGROUND_SYNC_INTERVAL', addCronJob);
}); });
}); });