Skip to content

Commit

Permalink
db url changed
Browse files Browse the repository at this point in the history
  • Loading branch information
ChauhanAbhinav committed Sep 6, 2019
1 parent 5b567ad commit 37da12d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
3 changes: 1 addition & 2 deletions server/db/dbUtil.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ let callback, db;
// exporting the mongo
mongo = {
connect: (callback)=> {
if(!db) MongoClient.connect(dbConfig.dbUrl.localUrl,{ useNewUrlParser: true }, function(err, client){
if(!db) MongoClient.connect(dbConfig.dbUrl.remoteUrl,{ useNewUrlParser: true }, function(err, client){

if(err) throw err;
console.log('Mongodb connected');
Expand All @@ -20,7 +20,6 @@ connect: (callback)=> {
},
getDb: function(){

console.log('returned db is '+db);
return db;
}

Expand Down
8 changes: 3 additions & 5 deletions server/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ socket.on('joinRoom', function(username, contact, room){
socketTable[username].rooms[room] = {contact: contact, room: room}; // update socket table
socket.join(room);

console.log(username + ' joined private room: ' + room);
// check if contact is connected in socket table, if yes join the contact
if(socketTable[contact])
{
Expand Down Expand Up @@ -80,7 +79,8 @@ socket.on('deleteRoom', function(username, contact, room){
contact = Number(contact);

socket.leave(room);
console.log('user deleted the room: '+room);

if(socketTable[username].rooms[room])
delete socketTable[username].rooms[room];
// remove contact from room also
if(socketTable[contact])
Expand All @@ -91,6 +91,7 @@ socket.on('deleteRoom', function(username, contact, room){
id = socketTable[contact].socketId;
io_private.connected[id].leave(room);
// update socket table

delete socketTable[contact].rooms[room];
}
else {
Expand All @@ -106,7 +107,6 @@ socket.on('deleteRoom', function(username, contact, room){
socket.on('sendchat', function (user, contact, room, msg, messageId) {
if(socketTable[user].rooms[room])
{
console.log('chat recieved in room: ' + room + ' from ' + 'user');

// notification update to rooms
socket.broadcast.to(room).emit('notificationAlert', user, contact, room, msg);
Expand Down Expand Up @@ -140,9 +140,7 @@ socket.on('sendVisibility', function(visibility, room){
// on user disconnection
socket.on('disconnect', function(){
console.log('user disconnected: '+socket.id);
// socket.broadcast.to(socket.room).emit('getVisibility', false);
rooms.forEach(room => {
console.log('user leaved the room: '+room);
socket.leave(room);
});
delete socketTable[socket.username];
Expand Down

0 comments on commit 37da12d

Please sign in to comment.