commit
3583834aba
|
@ -1,6 +1,7 @@
|
||||||
uuid = require('node-uuid')
|
uuid = require('node-uuid')
|
||||||
signing = require('./signing')
|
signing = require('./signing')
|
||||||
SubscriptionManager = require('./subscription').SubscriptionManager
|
SubscriptionManager = require('./subscription').SubscriptionManager
|
||||||
|
logger = require('./logger').logger
|
||||||
|
|
||||||
clients = {}
|
clients = {}
|
||||||
|
|
||||||
|
@ -8,7 +9,6 @@ clients = {}
|
||||||
class Client
|
class Client
|
||||||
constructor: (@ws) ->
|
constructor: (@ws) ->
|
||||||
@.id = uuid.v4()
|
@.id = uuid.v4()
|
||||||
|
|
||||||
@.handleEvents()
|
@.handleEvents()
|
||||||
|
|
||||||
handleEvents: () ->
|
handleEvents: () ->
|
||||||
|
@ -18,8 +18,8 @@ class Client
|
||||||
handleError: (error) ->
|
handleError: (error) ->
|
||||||
req = @ws.upgradeReq
|
req = @ws.upgradeReq
|
||||||
headers = req.headers
|
headers = req.headers
|
||||||
console.log "evt=client_error", "x_forwarded_for=#{headers['x-forwarded-for']}"
|
logger.error "evt=client_errorx_forwarded_for=%s", headers['x-forwarded-for']
|
||||||
console.log "Error: ", error
|
logger.error error
|
||||||
|
|
||||||
handleMessage: (message) ->
|
handleMessage: (message) ->
|
||||||
try
|
try
|
||||||
|
@ -58,7 +58,7 @@ class Client
|
||||||
try
|
try
|
||||||
@ws.send(JSON.stringify({cmd: "pong"}))
|
@ws.send(JSON.stringify({cmd: "pong"}))
|
||||||
catch e
|
catch e
|
||||||
console.error("Error: ", e)
|
logger.error e
|
||||||
|
|
||||||
close: () ->
|
close: () ->
|
||||||
if @.subscriptionManager
|
if @.subscriptionManager
|
||||||
|
|
13
index.coffee
13
index.coffee
|
@ -1,13 +1,16 @@
|
||||||
|
logger = require('./logger').logger
|
||||||
|
|
||||||
|
webSocket = require 'ws'
|
||||||
|
|
||||||
eventsConfig = require('./events-config')
|
eventsConfig = require('./events-config')
|
||||||
argv = require('minimist')(process.argv.slice(2));
|
argv = require('minimist')(process.argv.slice(2))
|
||||||
|
|
||||||
eventsConfig.loadConfigFile(argv.config || './config')
|
eventsConfig.loadConfigFile(argv.config || './config')
|
||||||
|
config = eventsConfig.config
|
||||||
|
|
||||||
config = eventsConfig.config;
|
client = require './client'
|
||||||
|
|
||||||
client = require('./client')
|
WebSocketServer = webSocket.Server
|
||||||
|
|
||||||
WebSocketServer = require('ws').Server
|
|
||||||
wss = new WebSocketServer(config.webSocketServer)
|
wss = new WebSocketServer(config.webSocketServer)
|
||||||
|
|
||||||
wss.on 'connection', (ws) ->
|
wss.on 'connection', (ws) ->
|
||||||
|
|
|
@ -0,0 +1,24 @@
|
||||||
|
winston = require 'winston'
|
||||||
|
|
||||||
|
simplestFormat = winston.format.printf((info) =>
|
||||||
|
"#{info.timestamp} #{info.level} #{info.message}")
|
||||||
|
|
||||||
|
logger = winston.createLogger({
|
||||||
|
format: winston.format.combine(
|
||||||
|
winston.format.splat(),
|
||||||
|
winston.format.timestamp({
|
||||||
|
format: 'YYYY-MM-DD HH:mm:ss'
|
||||||
|
}),
|
||||||
|
simplestFormat
|
||||||
|
),
|
||||||
|
transports: [
|
||||||
|
new winston.transports.Console({
|
||||||
|
level: "debug",
|
||||||
|
handleExceptions: true,
|
||||||
|
json: false,
|
||||||
|
colorize: true
|
||||||
|
})
|
||||||
|
],
|
||||||
|
});
|
||||||
|
|
||||||
|
exports.logger = logger
|
|
@ -29,6 +29,7 @@
|
||||||
"bluebird": "^2.9.10",
|
"bluebird": "^2.9.10",
|
||||||
"minimist": "^1.2.0",
|
"minimist": "^1.2.0",
|
||||||
"node-uuid": "^1.4.2",
|
"node-uuid": "^1.4.2",
|
||||||
|
"winston": "^3.0.0-rc5",
|
||||||
"ws": "^2.0.3"
|
"ws": "^2.0.3"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue