Kaynağa Gözat

chor: move queue to own process

poeti8 6 yıl önce
ebeveyn
işleme
0a4715b826
3 değiştirilmiş dosya ile 25 ekleme ve 21 silme
  1. 1 0
      server/queues/index.ts
  2. 20 0
      server/queues/queues.ts
  3. 4 21
      server/queues/visitQueue.ts

+ 1 - 0
server/queues/index.ts

@@ -0,0 +1 @@
+export * from "./queues";

+ 20 - 0
server/queues/queues.ts

@@ -0,0 +1,20 @@
+import Queue from "bull";
+import path from "path";
+
+const redis = {
+  port: Number(process.env.REDIS_PORT) || 6379,
+  host: process.env.REDIS_HOST || "127.0.0.1",
+  ...(process.env.REDIS_PASSWORD && { password: process.env.REDIS_PASSWORD })
+};
+
+const removeJob = job => job.remove();
+
+export const visitQueue = new Queue("visit", { redis });
+
+visitQueue.clean(5000, "completed");
+visitQueue.clean(5000, "failed");
+
+visitQueue.process(path.resolve(__dirname, "visitQueue.js"));
+
+visitQueue.on("completed", removeJob);
+visitQueue.on("failed", removeJob);

+ 4 - 21
server/queues.ts → server/queues/visitQueue.ts

@@ -1,21 +1,9 @@
-import Queue from "bull";
 import useragent from "useragent";
 import geoip from "geoip-lite";
 import URL from "url";
 
-import { createVisit, addLinkCount } from "./db/link";
-import { getStatsLimit } from "./utils";
-
-const redis = {
-  port: Number(process.env.REDIS_PORT) || 6379,
-  host: process.env.REDIS_HOST || "127.0.0.1",
-  ...(process.env.REDIS_PASSWORD && { password: process.env.REDIS_PASSWORD })
-};
-
-export const visitQueue = new Queue("visit", { redis });
-
-visitQueue.clean(5000, "completed");
-visitQueue.clean(5000, "failed");
+import { createVisit, addLinkCount } from "../db/link";
+import { getStatsLimit } from "../utils";
 
 const browsersList = ["IE", "Firefox", "Chrome", "Opera", "Safari", "Edge"];
 const osList = ["Windows", "Mac OS", "Linux", "Android", "iOS"];
@@ -24,7 +12,7 @@ const filterInBrowser = agent => item =>
 const filterInOs = agent => item =>
   agent.os.family.toLowerCase().includes(item.toLocaleLowerCase());
 
-visitQueue.process(({ data }) => {
+export default function({ data }) {
   const tasks = [];
 
   tasks.push(addLinkCount(data.link.id));
@@ -49,9 +37,4 @@ visitQueue.process(({ data }) => {
   }
 
   return Promise.all(tasks);
-});
-
-const removeJob = job => job.remove();
-
-visitQueue.on("completed", removeJob);
-visitQueue.on("failed", removeJob);
+}