Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #5 from toddtreece/master

TCP Connection Fix
  • Loading branch information...
commit cd49e25be76c50c7cf801940957bf6b5c88970ca 2 parents b24eb43 + d3ec435
@benlemasurier authored
Showing with 82 additions and 119 deletions.
  1. +39 −26 blode.js
  2. +0 −92 lib/Math.uuid.js
  3. +42 −0 package.json
  4. +1 −1  udp.js
View
65 blode.js
@@ -16,8 +16,6 @@
HOST = "127.0.0.1";
-require("./lib/Math.uuid");
-
var derp = require("./lib/util"),
io = require("socket.io"),
net = require("net"),
@@ -26,6 +24,7 @@ var derp = require("./lib/util"),
http = require("http"),
dgram = require("dgram"),
event = require("events"),
+ uuid = require('node-uuid'),
emitter = new event.EventEmitter,
log_buffer = { id: 0, severity: 'none', message: '--MARK--' };
@@ -52,32 +51,35 @@ function Client(stream, type) {
blode.tcp = {};
blode.tcp.broadcast = net.createServer(function(stream) {
+
stream.setEncoding('utf8');
- stream.on("connect", function() {
- var buffer = '';
- var client = new Client(stream, 'tcp');
- blode.clients.push(client);
-
- stream.on('error', function() {
- blode.clients.remove(client);
- client.stream.end();
- });
-
- stream.on('end', function() {
- blode.clients.remove(client);
- client.stream.end();
- });
-
- stream.on('data', function(data) {
- try {
- var subscribe = JSON.parse(data);
- if(subscribe instanceof Array)
- client.subscription = subscribe;
- } catch(e) { }
- });
+ var buffer = '',
+ client = new Client(stream, 'tcp');
+
+ blode.clients.push(client);
+
+ stream.on('error', function() {
+ blode.clients.remove(client);
+ client.stream.end();
+ });
+
+ stream.on('end', function() {
+ blode.clients.remove(client);
+ client.stream.end();
+ });
+
+ stream.on('data', function(data) {
+ try {
+ var subscribe = JSON.parse(data);
+ if(subscribe instanceof Array)
+ client.subscription = subscribe;
+ } catch(e) { console.log(e); }
});
+
}).listen(blode.config.socket.broadcast_port, HOST);
+
+
util.puts("tcp broadcast started on " + HOST + ":" + blode.config.socket.broadcast_port);
blode.io = io.listen(blode.config.io.port);
@@ -100,18 +102,29 @@ function Client(stream, type) {
util.puts("socket.io broadcast started on " + HOST + ":" + blode.config.io.port);
emitter.on("log", function(log) {
- log.id = Math.uuid();
+
+ log.id = uuid.v4();
blode.clients.forEach(function(client) {
+
try {
- if(client.subscription.indexOf(log.severity) != -1)
+
+ if(client.subscription.indexOf(log.severity) != -1) {
+
if(client.type === 'tcp')
client.stream.write(JSON.stringify(log) + "\r\n");
else if(client.type === 'io')
client.stream.volatile.emit('message', JSON.stringify(log));
+
+ }
+
} catch(e) {
+
+ console.log(e);
socket_clients.remove(client);
+
}
+
});
});
View
92 lib/Math.uuid.js
@@ -1,92 +0,0 @@
-/*!
-Math.uuid.js (v1.4)
-http://www.broofa.com
-mailto:robert@broofa.com
-
-Copyright (c) 2010 Robert Kieffer
-Dual licensed under the MIT and GPL licenses.
-*/
-
-/*
- * Generate a random uuid.
- *
- * USAGE: Math.uuid(length, radix)
- * length - the desired number of characters
- * radix - the number of allowable values for each character.
- *
- * EXAMPLES:
- * // No arguments - returns RFC4122, version 4 ID
- * >>> Math.uuid()
- * "92329D39-6F5C-4520-ABFC-AAB64544E172"
- *
- * // One argument - returns ID of the specified length
- * >>> Math.uuid(15) // 15 character ID (default base=62)
- * "VcydxgltxrVZSTV"
- *
- * // Two arguments - returns ID of the specified length, and radix. (Radix must be <= 62)
- * >>> Math.uuid(8, 2) // 8 character ID (base=2)
- * "01001010"
- * >>> Math.uuid(8, 10) // 8 character ID (base=10)
- * "47473046"
- * >>> Math.uuid(8, 16) // 8 character ID (base=16)
- * "098F4D35"
- */
-(function() {
- // Private array of chars to use
- var CHARS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
-
- Math.uuid = function (len, radix) {
- var chars = CHARS, uuid = [];
- radix = radix || chars.length;
-
- if (len) {
- // Compact form
- for (var i = 0; i < len; i++) uuid[i] = chars[0 | Math.random()*radix];
- } else {
- // rfc4122, version 4 form
- var r;
-
- // rfc4122 requires these characters
- uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
- uuid[14] = '4';
-
- // Fill in random data. At i==19 set the high bits of clock sequence as
- // per rfc4122, sec. 4.1.5
- for (var i = 0; i < 36; i++) {
- if (!uuid[i]) {
- r = 0 | Math.random()*16;
- uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
- }
- }
- }
-
- return uuid.join('');
- };
-
- // A more performant, but slightly bulkier, RFC4122v4 solution. We boost performance
- // by minimizing calls to random()
- Math.uuidFast = function() {
- var chars = CHARS, uuid = new Array(36), rnd=0, r;
- for (var i = 0; i < 36; i++) {
- if (i==8 || i==13 || i==18 || i==23) {
- uuid[i] = '-';
- } else if (i==14) {
- uuid[i] = '4';
- } else {
- if (rnd <= 0x02) rnd = 0x2000000 + (Math.random()*0x1000000)|0;
- r = rnd & 0xf;
- rnd = rnd >> 4;
- uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
- }
- }
- return uuid.join('');
- };
-
- // A more compact, but less performant, RFC4122v4 solution:
- Math.uuidCompact = function() {
- return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
- var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8);
- return v.toString(16);
- }).toUpperCase();
- };
-})();
View
42 package.json
@@ -0,0 +1,42 @@
+{
+ "name": "blode",
+ "version": "0.0.2",
+ "description": "a simple, powerful syslog-like event broadcast daemon",
+ "main": "blode.js",
+ "directories": {
+ "example": "example",
+ "test": "test"
+ },
+ "scripts": {
+ "test": "test/ping"
+ },
+ "repository": {
+ "type": "git",
+ "url": "git://github.com/benlemasurier/blode.git"
+ },
+ "keywords": [
+ "blode",
+ "syslog",
+ "logging"
+ ],
+ "author": "Ben LeMasurier <ben.lemasurier@sparkfun.com>",
+ "contributors":[
+ {
+ "name" : "Todd Treece",
+ "email" : "toddtreece@gmail.com"
+ }
+ ],
+ "license": "GPL v2",
+ "bugs": {
+ "url": "https://github.com/benlemasurier/blode/issues"
+ },
+ "homepage": "https://github.com/benlemasurier/blode",
+ "engines": {
+ "node": ">=0.10.15"
+ },
+ "engineStrict": true,
+ "dependencies": {
+ "socket.io": "~0.9.16",
+ "node-uuid": "~1.4.1"
+ }
+}
View
2  udp.js
@@ -6,7 +6,7 @@
var udp = require("dgram").createSocket("udp4");
udp.on("message", function (message, rinfo) {
- try { event.emit("log", JSON.parse(message)); } catch(e) {}
+ try { event.emit("log", JSON.parse(message)); } catch(e) { console.log(e); }
});
udp.bind(port);
Please sign in to comment.
Something went wrong with that request. Please try again.