Merge pull request #190 from cubedro/develop

Updated trusted nodes
This commit is contained in:
Marian OANCΞA 2015-06-13 07:45:21 +03:00
commit 25c9a2a4e7
3 changed files with 14 additions and 13 deletions

7
app.js
View File

@ -1,7 +1,7 @@
var _ = require('lodash'); var _ = require('lodash');
var logger = require('./lib/utils/logger'); var logger = require('./lib/utils/logger');
var chalk = require('chalk'); var chalk = require('chalk');
var http = require('http');
var WS_SECRET = process.env.WS_SECRET || "eth-net-stats-has-a-secret"; var WS_SECRET = process.env.WS_SECRET || "eth-net-stats-has-a-secret";
@ -10,11 +10,10 @@ var WS_SECRET = process.env.WS_SECRET || "eth-net-stats-has-a-secret";
if( process.env.NODE_ENV !== 'production' ) if( process.env.NODE_ENV !== 'production' )
{ {
var app = require('./lib/express'); var app = require('./lib/express');
server = require('http').createServer(app); server = http.createServer(app);
} }
else else
server = require('http').createServer(); server = http.createServer();
// Init socket vars // Init socket vars
var Primus = require('primus'); var Primus = require('primus');

View File

@ -1,13 +1,14 @@
var trusted = [ var trusted = [
'54.94.239.50',
'52.16.188.185', '52.16.188.185',
'52.4.40.229', '54.94.239.50',
'52.4.131.128', '52.7.164.228',
'52.0.243.36', '52.7.84.201',
'52.4.180.23', '54.164.66.158',
'52.5.60.7', '54.172.106.147',
'52.5.26.21', '54.165.231.82',
'52.5.25.137', '54.165.244.62',
'54.165.246.230',
'54.165.236.161',
'::ffff:127.0.0.1', '::ffff:127.0.0.1',
]; ];

View File

@ -296,7 +296,8 @@ angular.module('netStatsApp.directives', [])
scope: { scope: {
data: '=' data: '='
}, },
link: function(scope, element, attrs) { link: function(scope, element, attrs)
{
var margin = {top: 0, right: 0, bottom: 0, left: 0}; var margin = {top: 0, right: 0, bottom: 0, left: 0};
var width = 280 - margin.left - margin.right, var width = 280 - margin.left - margin.right,
height = 63 - margin.top - margin.bottom; height = 63 - margin.top - margin.bottom;