From 05882211077a30e27ebbb79baff0cf8fb87b7ae2 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 30 Jul 2018 16:34:47 +0200 Subject: Remove kue migration --- server/controllers/activitypub/inbox.ts | 2 - server/initializers/migrations/0230-kue-to-bull.ts | 60 ---------------------- 2 files changed, 62 deletions(-) delete mode 100644 server/initializers/migrations/0230-kue-to-bull.ts diff --git a/server/controllers/activitypub/inbox.ts b/server/controllers/activitypub/inbox.ts index 73fbd94aa..a106df717 100644 --- a/server/controllers/activitypub/inbox.ts +++ b/server/controllers/activitypub/inbox.ts @@ -36,8 +36,6 @@ async function inboxController (req: express.Request, res: express.Response, nex const rootActivity: RootActivity = req.body let activities: Activity[] = [] - console.log(rootActivity) - if ([ 'Collection', 'CollectionPage' ].indexOf(rootActivity.type) !== -1) { activities = (rootActivity as ActivityPubCollection).items } else if ([ 'OrderedCollection', 'OrderedCollectionPage' ].indexOf(rootActivity.type) !== -1) { diff --git a/server/initializers/migrations/0230-kue-to-bull.ts b/server/initializers/migrations/0230-kue-to-bull.ts deleted file mode 100644 index 5f4d88bef..000000000 --- a/server/initializers/migrations/0230-kue-to-bull.ts +++ /dev/null @@ -1,60 +0,0 @@ -import * as Sequelize from 'sequelize' -import { createClient } from 'redis' -import { CONFIG } from '../constants' -import { JobQueue } from '../../lib/job-queue' -import { Redis } from '../../lib/redis' -import { initDatabaseModels } from '../database' - -async function up (utils: { - transaction: Sequelize.Transaction - queryInterface: Sequelize.QueryInterface - sequelize: Sequelize.Sequelize -}): Promise { - await initDatabaseModels(false) - - return new Promise((res, rej) => { - const client = createClient(Redis.getRedisClient()) - - const jobsPrefix = 'q-' + CONFIG.WEBSERVER.HOST - - client.sort(jobsPrefix + ':jobs:inactive', 'by', 'alpha', 'ASC', (err, jobStrings) => { - if (err) return rej(err) - - const jobPromises = jobStrings - .map(s => s.split('|')) - .map(([ , jobId ]) => { - return new Promise((res, rej) => { - client.hgetall(jobsPrefix + ':job:' + jobId, (err, job) => { - if (err) return rej(err) - - try { - const parsedData = JSON.parse(job.data) - - return res({ type: job.type, payload: parsedData }) - } catch (err) { - console.error('Cannot parse data %s.', job.data) - return res(undefined) - } - }) - }) - }) - - JobQueue.Instance.init() - .then(() => Promise.all(jobPromises)) - .then((jobs: any) => { - const createJobPromises = jobs - .filter(job => job !== null) - .map(job => JobQueue.Instance.createJob(job)) - - return Promise.all(createJobPromises) - }) - .then(() => res()) - }) - }) -} - -function down (options) { - throw new Error('Not implemented.') -} - -export { up, down } -- cgit v1.2.3