revert latest breaking amqp things

Author: KartulUdus

app/src/send.js

@@ -11,20 +11,20 @@ cache.on('put', function(key, val, ttl) { });
 
 module.exports = {
 
-    sendHooks: function(conn, queue, data) {
+    sendHooks: function(queue, data) {
 
         if(queue === 'pokemon' || queue === 'raid' || queue === 'gym_details') {
             if(queue === 'pokemon'){
                 if(cache.get(data.encounter_id) === undefined){
                     cache.put(data.encounter_id, 'cached');
-                    sendRabbitMQ(conn, queue, data)
+                    sendRabbitMQ(queue, data)
                 } else log.warn(`Encounter ${data.encounter_id} was sent again too fast`)
             }else if(queue === 'raid'){
                 if(cache.get(data.gym_id) === undefined) {
                     cache.put(data.gym_id, 'cachedGym');
-                    sendRabbitMQ(conn, queue, data)
+                    sendRabbitMQ(queue, data)
                 } else log.warn(`Encounter ${data.gym_id} was sent again too fast`)
-            } else sendRabbitMQ(conn, queue, data);
+            } else sendRabbitMQ(queue, data);
         }
     },
     sendTestHook: function(queue, data, callback) {
@@ -41,11 +41,14 @@ module.exports = {
                 conn.close();
             }, 500);
         });
+
     }
+
 };
 
-function sendRabbitMQ(conn, queue, data){
+function sendRabbitMQ(queue, data){
 
+    amqp.connect(config.rabbit.conn, function (err, conn) {
         conn.createChannel(function (err, ch) {
             let q = queue;
             ch.assertQueue(q, {durable: false});
@@ -55,4 +58,5 @@ function sendRabbitMQ(conn, queue, data){
         setTimeout(function () {
             conn.close();
         }, 500);
+    });
 }

app/src/server.js

@@ -5,7 +5,6 @@ const log = require("./logger");
 const sender = require("./send");
 const query = require('./sql/queries');
 const migrator = require('./sql/migration/migrator');
-const amqpc = require('./util/helpers/AMQPConnHelper');
 
 const opts = {
     schema: {
@@ -20,22 +19,20 @@ const opts = {
     }
 };
 
-let connection = undefined;
-
 //webserver healthcheck
 
-    fastify.get('/', opts, function (request, reply){
-        reply.type('application/json').code(200);
-        reply.send({ Webserver: 'Happy' });
-    });
+fastify.get('/', opts, function (request, reply){
+    reply.type('application/json').code(200);
+    reply.send({ Webserver: 'Happy' });
+});
 
 //receive hooks
 
 
 fastify.post('/', opts, function(request, reply){
     request.body.forEach(function(hook){
         log.debug(prettyjson.render(hook));
-        sender.sendHooks(connection, hook.type, hook.message);
+        sender.sendHooks(hook.type, hook.message);
     });
     reply.type('application/json').code(200);
     reply.send({ Webserver: 'Happy' });
@@ -44,12 +41,6 @@ fastify.post('/', opts, function(request, reply){
 
 fastify.listen(config.general.port, config.general.host, function (err) {
     if (err) throw err;
-    amqpc.connection(function(err, conn){
-       if(err){ log.error(`AMQP Not happy, please check bunnywabbit ${err}`);
-       throw err;
-       }
-       connection = conn;
-    });
     log.info(`Poracle started on ${fastify.server.address().address}:${fastify.server.address().port}`)
 });
 
@@ -61,4 +52,3 @@ query.countQuery('TABLE_NAME','information_schema.tables','table_schema',config.
         migrator.migration1()
     }
 });
-