From ed592b54c3adb708060f7b3e740c856c213ce49d Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 20 Jul 2025 14:03:28 -0400 Subject: [PATCH] fis room data --- .env | 5 +++-- .env.prod | 5 +++-- docker-compose.yml | 10 ++++------ env_sample | 5 +++-- server.js | 9 ++++++--- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.env b/.env index adbf0be..43e9192 100644 --- a/.env +++ b/.env @@ -1,6 +1,7 @@ -WRENCHJOB_PORT=3000 -WRENCHJOB_POSTGRE_URL='postgresql://merms_panel:merms_panel@10.20.30.60:5432/merms_panel' +MERMS_PORT=3000 +MERMS_POSTGRE_URL='postgresql://merms_panel:merms_panel@10.20.30.60:5432/merms_panel' WRENCHJOB_KAFKA_BROKER01='10.10.10.120:9092' SOCKET_URL='https://devsocket.mermsemr.com' +# SOCKET_URL="10.10.10.13:5005" SOCKET_PORT=5005 TEST=111 diff --git a/.env.prod b/.env.prod index adbf0be..43e9192 100644 --- a/.env.prod +++ b/.env.prod @@ -1,6 +1,7 @@ -WRENCHJOB_PORT=3000 -WRENCHJOB_POSTGRE_URL='postgresql://merms_panel:merms_panel@10.20.30.60:5432/merms_panel' +MERMS_PORT=3000 +MERMS_POSTGRE_URL='postgresql://merms_panel:merms_panel@10.20.30.60:5432/merms_panel' WRENCHJOB_KAFKA_BROKER01='10.10.10.120:9092' SOCKET_URL='https://devsocket.mermsemr.com' +# SOCKET_URL="10.10.10.13:5005" SOCKET_PORT=5005 TEST=111 diff --git a/docker-compose.yml b/docker-compose.yml index a284361..007a9f5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3' +# version: '3' services: merms-event-manager: build: @@ -14,12 +14,10 @@ services: extra_hosts: - api.mermsemr.com:10.10.33.15 - devapi.mermsemr.com:10.10.33.15 - - dev-socket.mermsemr.com:10.10.33.15 + - devsocket.mermsemr.com:10.10.33.15 - socket.mermsemr.com:10.10.33.15 - - dev-media.mermsemr.com:10.10.33.15 - - media.mermsemr.com:10.10.33.15 environment: - - PORT=${WRENCHJOB_PORT} - - POSTGRE_URL=${WRENCHJOB_POSTGRE_URL} + - PORT=${MERMS_PORT} + - POSTGRE_URL=${MERMS_POSTGRE_URL} volumes: src: \ No newline at end of file diff --git a/env_sample b/env_sample index adbf0be..43e9192 100644 --- a/env_sample +++ b/env_sample @@ -1,6 +1,7 @@ -WRENCHJOB_PORT=3000 -WRENCHJOB_POSTGRE_URL='postgresql://merms_panel:merms_panel@10.20.30.60:5432/merms_panel' +MERMS_PORT=3000 +MERMS_POSTGRE_URL='postgresql://merms_panel:merms_panel@10.20.30.60:5432/merms_panel' WRENCHJOB_KAFKA_BROKER01='10.10.10.120:9092' SOCKET_URL='https://devsocket.mermsemr.com' +# SOCKET_URL="10.10.10.13:5005" SOCKET_PORT=5005 TEST=111 diff --git a/server.js b/server.js index acd7597..af716d7 100644 --- a/server.js +++ b/server.js @@ -23,8 +23,8 @@ app.use(cookieParser()); // parse application/vnd.api+json as json app.use(bodyParser.json({ type: 'application/vnd.api+json' })) -// const socket = io.connect(process.env.SOCKET_URL); -const socket = io.connect("http://10.0.0.32:5005"); +const socket = io.connect(process.env.SOCKET_URL); +//const socket = io.connect("http://10.0.0.32:5005"); // // respond with "hello world" when a GET request is made to the homepage @@ -45,7 +45,10 @@ app.get('/broadcast/selected', (req, res) => { }) app.get('/broadcast/provisioning', (req, res) => { - const room = 'merms_provision_events'; + logger.info('***** Server PROVSION STEPS MESSAGE ********* '); + logger.info( req.query.product_uid ); + const room = req.query.product_uid; + //const room = 'merms_provision_events'; const message_action = 'refresh_provision_actions'; socket.emit("join_room", room); socket.emit("send_message", { message_action , room });