mirror of
				https://github.com/NodeBB/NodeBB.git
				synced 2025-10-31 11:05:54 +01:00 
			
		
		
		
	fix: #13407, don't restart user jobs
if jobsDisabled=true on that process
This commit is contained in:
		| @@ -2,6 +2,8 @@ | |||||||
|  |  | ||||||
| const async = require('async'); | const async = require('async'); | ||||||
| const winston = require('winston'); | const winston = require('winston'); | ||||||
|  | const nconf = require('nconf'); | ||||||
|  | const pubsub = require('../../pubsub'); | ||||||
|  |  | ||||||
| const db = require('../../database'); | const db = require('../../database'); | ||||||
| const groups = require('../../groups'); | const groups = require('../../groups'); | ||||||
| @@ -129,8 +131,15 @@ User.forcePasswordReset = async function (socket, uids) { | |||||||
| 	uids.forEach(uid => sockets.in(`uid_${uid}`).emit('event:logout')); | 	uids.forEach(uid => sockets.in(`uid_${uid}`).emit('event:logout')); | ||||||
| }; | }; | ||||||
|  |  | ||||||
|  | pubsub.on('admin.user.restartJobs', () => { | ||||||
|  | 	if (nconf.get('runJobs')) { | ||||||
|  | 		winston.verbose('[user/jobs] Restarting jobs...'); | ||||||
|  | 		user.startJobs(); | ||||||
|  | 	} | ||||||
|  | }); | ||||||
|  |  | ||||||
| User.restartJobs = async function () { | User.restartJobs = async function () { | ||||||
| 	user.startJobs(); | 	pubsub.publish('admin.user.restartJobs', {}); | ||||||
| }; | }; | ||||||
|  |  | ||||||
| User.loadGroups = async function (socket, uids) { | User.loadGroups = async function (socket, uids) { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user