summaryrefslogtreecommitdiff
path: root/src/server/api
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-04-04 22:48:27 +0900
committerGitHub <noreply@github.com>2018-04-04 22:48:27 +0900
commitcf160285f82a200a6f042cf924272809280bac79 (patch)
tree9cf0211613474ecf5868e8a2bd59469a83bc9bb3 /src/server/api
parentMerge pull request #1393 from akihikodaki/duplicate (diff)
parentRetry HTTP requests (diff)
downloadsharkey-cf160285f82a200a6f042cf924272809280bac79.tar.gz
sharkey-cf160285f82a200a6f042cf924272809280bac79.tar.bz2
sharkey-cf160285f82a200a6f042cf924272809280bac79.zip
Merge pull request #1394 from akihikodaki/duplicate
Retry HTTP requests
Diffstat (limited to 'src/server/api')
-rw-r--r--src/server/api/endpoints/following/create.ts4
-rw-r--r--src/server/api/endpoints/following/delete.ts4
-rw-r--r--src/server/api/service/github.ts4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/server/api/endpoints/following/create.ts b/src/server/api/endpoints/following/create.ts
index e568595215..9ccbe20171 100644
--- a/src/server/api/endpoints/following/create.ts
+++ b/src/server/api/endpoints/following/create.ts
@@ -4,7 +4,7 @@
import $ from 'cafy';
import User from '../../../../models/user';
import Following from '../../../../models/following';
-import queue from '../../../../queue';
+import { createHttp } from '../../../../queue';
/**
* Follow a user
@@ -56,7 +56,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
followeeId: followee._id
});
- queue.create('http', { type: 'follow', following: _id }).save();
+ createHttp({ type: 'follow', following: _id }).save();
// Send response
res();
diff --git a/src/server/api/endpoints/following/delete.ts b/src/server/api/endpoints/following/delete.ts
index bf21bf0cb7..0684b87504 100644
--- a/src/server/api/endpoints/following/delete.ts
+++ b/src/server/api/endpoints/following/delete.ts
@@ -4,7 +4,7 @@
import $ from 'cafy';
import User from '../../../../models/user';
import Following from '../../../../models/following';
-import queue from '../../../../queue';
+import { createHttp } from '../../../../queue';
/**
* Unfollow a user
@@ -49,7 +49,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
return rej('already not following');
}
- queue.create('http', {
+ createHttp({
type: 'unfollow',
id: exist._id
}).save(error => {
diff --git a/src/server/api/service/github.ts b/src/server/api/service/github.ts
index 4fd59c2a94..5fc4a92f57 100644
--- a/src/server/api/service/github.ts
+++ b/src/server/api/service/github.ts
@@ -3,7 +3,7 @@ import * as express from 'express';
//const crypto = require('crypto');
import User from '../../../models/user';
import config from '../../../config';
-import queue from '../../../queue';
+import { createHttp } from '../../../queue';
module.exports = async (app: express.Application) => {
if (config.github_bot == null) return;
@@ -42,7 +42,7 @@ module.exports = async (app: express.Application) => {
const commit = event.commit;
const parent = commit.parents[0];
- queue.create('http', {
+ createHttp({
type: 'gitHubFailureReport',
userId: bot._id,
parentUrl: parent.url,