From e44c2b6e411d5090781e2c14b8ae495a8c76272d Mon Sep 17 00:00:00 2001 From: Luke Berndt Date: Tue, 11 Apr 2023 09:38:32 -0400 Subject: [PATCH] ready to rock --- backend/index.js | 12 +++++------- docker-compose.yml | 5 ----- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/backend/index.js b/backend/index.js index 1551287..ee2227c 100644 --- a/backend/index.js +++ b/backend/index.js @@ -23,13 +23,13 @@ var app = express(); const server = require('http').createServer(app); -/* + const io = require('socket.io')(server, { cors: { origin: "*", methods: ["GET", "POST"], } -});*/ +}); @@ -41,7 +41,7 @@ configureExpress(app) // ------------------------------------------- -var host = process.env['MONGO_NODE_DRIVER_HOST'] != null ? process.env['MONGO_NODE_DRIVER_HOST'] : 'localhost'; +var host = process.env['MONGO_NODE_DRIVER_HOST'] != null ? process.env['MONGO_NODE_DRIVER_HOST'] : 'mongo'; var port = process.env['MONGO_NODE_DRIVER_PORT'] != null ? process.env['MONGO_NODE_DRIVER_PORT'] : 27017; var mongoUrl = 'mongodb://' + host + ':' + port + '/scanner'; @@ -237,7 +237,7 @@ function notify_clients(call) { -/* + io.sockets.on('connection', function (client) { clients[client.id] = { socket: client, active: false }; clients[client.id].timestamp = new Date(); @@ -266,7 +266,7 @@ io.sockets.on('connection', function (client) { return; } if (group) { - //clients[client.id].talkgroupNums = group.talkgroups; + clients[client.id].talkgroupNums = group.talkgroups; } else { console.error("Error - Socket: Invalid group " + data.filterCode + " Shortname: " + data.shortName + " ClientID: " + client.id); delete clients[client.id]; @@ -293,8 +293,6 @@ io.sockets.on('connection', function (client) { }); }); -*/ - stats.init_stats(); server.listen(app.get("port"), (err) => { diff --git a/docker-compose.yml b/docker-compose.yml index 19638b1..e4d128a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -56,16 +56,11 @@ services: - REACT_APP_ADMIN_SERVER - REACT_APP_FRONTEND_SERVER - REACT_APP_SOCKET_SERVER - - REACT_APP_COOKIE_DOMAIN - REACT_APP_ACCOUNT_SERVER - S3_ENDPOINT - S3_BUCKET - S3_PROFILE - S3_REGION - - TWITTER_CONSUMER_KEY - - TWITTER_CONSUMER_SECRET - - TWITTER_ACCESS_TOKEN_KEY - - TWITTER_ACCESS_TOKEN_SECRET volumes: - "~/.aws:/home/app/.aws" depends_on: