From 02517192fde6c616bc47fefb0d4b4e0819218079 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Sun, 25 Dec 2016 16:40:29 +0800
Subject: [PATCH] queue错误修正
---
queue.js | 40 ++++++++--------------------------------
1 files changed, 8 insertions(+), 32 deletions(-)
diff --git a/queue.js b/queue.js
index 9a061d7..841d19c 100644
--- a/queue.js
+++ b/queue.js
@@ -6,43 +6,19 @@
var moment = require('moment');
var uri = 'amqp://guest:guest@121.40.92.176';
-var ex = 'ex_data_dev1';
module.exports.publishMessage = function(data) {
+ this.pushToMQ('ex_data_dev1', {
+ data: data,
+ time: moment().format('YYYY-MM-DD HH:mm:ss')
+ })
+};
+
+module.exports.pushToMQ = function(ex, data) {
amqp.connect(uri, function(err, conn) {
conn.createChannel(function(err, ch) {
ch.assertExchange(ex, 'fanout', { durable: false });
- var message = '{"data": "' + data + '", "time":"' + moment().format('YYYY-MM-DD HH:mm:ss') + '"}';
- ch.publish(ex, '', new Buffer(message));
- });
- setTimeout(function() {
- conn.close();
- //process.exit(0)
- }, 500);
- });
-};
-
-module.exports.pushToScreen = function(data) {
- amqp.connect(uri, function(err, conn) {
- conn.createChannel(function(err, ch) {
- ch.assertExchange('ex_data_screen', 'fanout', { durable: false });
- var message = {
- mac: data.mac,
- address: "���������������������������������",
- location: {
- lat:31.430616,
- lng:120.988327
- },
- data: {
- x1: data.x1,
- x2: data.x2,
- x3: data.x3,
- x4: data.x4,
- x5: data.x5,
- x6: data.x6
- }
- };
- ch.publish('ex_data_screen', '', new Buffer(JSON.stringify(message)));
+ ch.publish(ex, '', new Buffer(JSON.stringify(data)));
});
setTimeout(function() {
conn.close();
--
Gitblit v1.8.0