BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved redis connection logging.

Browse Source
This commit is contained in:
Ghazi Triki 2018-12-06 21:35:51 +01:00
parent c9791b32ee
commit 114cba670f
10 changed files with 83 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bbb-apps-common/src/main/scala/org/bigbluebutton/client/endpoint/redis/Red5AppsRedisSubscriberActor.scala
View File

@ -39,9 +39,9 @@ class Red5AppsRedisSubscriberActor(system: ActorSystem, jsonMsgBus: JsonMsgFromA
}
def message(pattern: String, channel: String, message: String): Unit = { log.info("Subscribed to channel {} with pattern {}", channel, pattern) }
def psubscribed(pattern: String, count: Long): Unit = { log.info("Subscribed to pattern {}", pattern) }
def punsubscribed(pattern: String, count: Long): Unit = { log.info("Unsubscribed to pattern {}", pattern) }
def punsubscribed(pattern: String, count: Long): Unit = { log.info("Unsubscribed from pattern {}", pattern) }
def subscribed(channel: String, count: Long): Unit = { log.info("Subscribed to pattern {}", channel) }
def unsubscribed(channel: String, count: Long): Unit = { log.info("Subscribed to channel {}", channel) }
def unsubscribed(channel: String, count: Long): Unit = { log.info("Unsubscribed from channel {}", channel) }
})
}

24
bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/RedisAwareCommunicator.java
View File

@ -20,13 +20,25 @@
package org.bigbluebutton.common2.redis;
import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
import org.slf4j.Logger;
import io.lettuce.core.RedisClient;
import io.lettuce.core.event.Event;
import io.lettuce.core.event.EventBus;
import io.lettuce.core.event.connection.ConnectedEvent;
import io.lettuce.core.event.connection.ConnectionActivatedEvent;
import io.lettuce.core.event.connection.ConnectionDeactivatedEvent;
import io.lettuce.core.event.connection.DisconnectedEvent;
import reactor.core.Disposable;
public abstract class RedisAwareCommunicator {
protected RedisClient redisClient;
protected Disposable eventBusSubscription;
protected EventBus eventBus;
protected String host;
protected String password;
protected int port;
@ -41,6 +53,18 @@ public abstract class RedisAwareCommunicator {
this.password = password;
}
protected void connectionStatusHandler(Event event, Logger log) {
if (event instanceof ConnectedEvent) {
log.info("Connected to redis");
} else if (event instanceof ConnectionActivatedEvent) {
log.info("Connected to redis activated");
} else if (event instanceof DisconnectedEvent) {
log.info("Disconnected from redis");
} else if (event instanceof ConnectionDeactivatedEvent) {
log.info("Connected to redis deactivated");
}
}
public void setClientName(String clientName) {
this.clientName = clientName;
}

13
bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/RedisStorageService.java
View File

@ -43,11 +43,14 @@ public class RedisStorageService extends RedisAwareCommunicator {
redisClient = RedisClient.create(redisUri);
redisClient.setOptions(ClientOptions.builder().autoReconnect(true).build());
eventBus = redisClient.getResources().eventBus();
eventBusSubscription = eventBus.get().subscribe(e -> connectionStatusHandler(e, log));
connection = redisClient.connect();
}
public void stop() {
eventBusSubscription.dispose();
connection.close();
redisClient.shutdown();
log.info("RedisStorageService Stopped");
@ -93,15 +96,17 @@ public class RedisStorageService extends RedisAwareCommunicator {
RedisCommands<String, String> commands = connection.sync();
Long msgid = commands.incr("global:nextRecordedMsgId");
commands.hmset("recording:" + meetingId + ":" + msgid, event);
String key = "recording:" + meetingId + ":" + msgid;
commands.hmset(key, event);
/**
* We set the key to expire after 14 days as we are still recording the
* event into redis even if the meeting is not recorded. (ralam sept 23,
* 2015)
*/
commands.expire("meeting:" + meetingId + ":recordings", expireKey);
commands.rpush("meeting:" + meetingId + ":recordings", Long.toString(msgid));
commands.expire("meeting:" + meetingId + ":recordings", expireKey);
commands.expire(key, expireKey);
key = "meeting:" + meetingId + ":recordings";
commands.rpush(key, Long.toString(msgid));
commands.expire(key, expireKey);
connection.close();
}

2
bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/MessageReceiver.java
View File

@ -41,6 +41,8 @@ public class MessageReceiver extends RedisAwareCommunicator {
redisClient = RedisClient.create(redisUri);
redisClient.setOptions(ClientOptions.builder().autoReconnect(true).build());
eventBus = redisClient.getResources().eventBus();
eventBusSubscription = eventBus.get().subscribe(e -> connectionStatusHandler(e, log));
connectionPool = ConnectionPoolSupport.createGenericObjectPool(() -> redisClient.connectPubSub(),
createPoolingConfig());

2
bbb-common-message/src/main/java/org/bigbluebutton/common2/redis/pubsub/MessageSender.java
View File

@ -43,6 +43,8 @@ public class MessageSender extends RedisAwareCommunicator {
redisClient = RedisClient.create(redisUri);
redisClient.setOptions(ClientOptions.builder().autoReconnect(true).build());
eventBus = redisClient.getResources().eventBus();
eventBusSubscription = eventBus.get().subscribe(e -> connectionStatusHandler(e, log));
connectionPool = ConnectionPoolSupport.createGenericObjectPool(() -> redisClient.connectPubSub(),
createPoolingConfig());

29
bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisConnectionHandler.scala Normal file
View File

@ -0,0 +1,29 @@
package org.bigbluebutton.common2.redis
import io.lettuce.core.RedisClient
import io.lettuce.core.event.Event
import io.lettuce.core.event.EventBus
import io.lettuce.core.event.connection.{ ConnectionDeactivatedEvent, ConnectionActivatedEvent, ConnectedEvent, DisconnectedEvent }
import reactor.core.Disposable
import akka.event.LoggingAdapter
trait RedisConnectionHandler {
def subscribeToEventBus(redis: RedisClient, log: LoggingAdapter) {
val eventBus: EventBus = redis.getResources().eventBus();
// @todo : unsubscribe when connection is closed
val eventBusSubscription: Disposable = eventBus.get().subscribe(e => connectionStatusHandler(e, log))
}
def connectionStatusHandler(event: Event, log: LoggingAdapter) {
if (event.isInstanceOf[ConnectedEvent]) {
log.info("Connected to redis");
} else if (event.isInstanceOf[ConnectionActivatedEvent]) {
log.info("Connection to redis activated");
} else if (event.isInstanceOf[DisconnectedEvent]) {
log.info("Disconnected from redis");
} else if (event.isInstanceOf[ConnectionDeactivatedEvent]) {
log.info("Connection to redis deactivated");
}
}
}

8
bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisPublisher.scala
View File

@ -1,8 +1,14 @@
package org.bigbluebutton.common2.redis
import akka.actor.ActorSystem
import akka.event.Logging
class RedisPublisher(system: ActorSystem, clientName: String) extends RedisClientProvider(system, clientName) with RedisConnectionHandler {
val log = Logging(system, getClass)
subscribeToEventBus(redis, log)
class RedisPublisher(system: ActorSystem, clientName: String) extends RedisClientProvider(system, clientName) {
val connection = redis.connectPubSub()
redis.connect()

13
bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisSubscriberProvider.scala
View File

@ -18,7 +18,10 @@ import java.io.PrintWriter
abstract class RedisSubscriberProvider(system: ActorSystem, clientName: String,
channels: Seq[String], patterns: Seq[String],
jsonMsgBus: IncomingJsonMessageBus)
extends RedisClientProvider(system, clientName) with Actor with ActorLogging {
extends RedisClientProvider(system, clientName) with RedisConnectionHandler with Actor with ActorLogging {
subscribeToEventBus(redis, log)
var connection = redis.connectPubSub()
def addListener(appChannel: String) {
@ -31,9 +34,9 @@ abstract class RedisSubscriberProvider(system: ActorSystem, clientName: String,
}
def message(pattern: String, channel: String, message: String): Unit = { log.info("Subscribed to channel {} with pattern {}", channel, pattern) }
def psubscribed(pattern: String, count: Long): Unit = { log.info("Subscribed to pattern {}", pattern) }
def punsubscribed(pattern: String, count: Long): Unit = { log.info("Unsubscribed to pattern {}", pattern) }
def punsubscribed(pattern: String, count: Long): Unit = { log.info("Unsubscribed from pattern {}", pattern) }
def subscribed(channel: String, count: Long): Unit = { log.info("Subscribed to pattern {}", channel) }
def unsubscribed(channel: String, count: Long): Unit = { log.info("Subscribed to channel {}", channel) }
def unsubscribed(channel: String, count: Long): Unit = { log.info("Unsubscribed from channel {}", channel) }
})
}
@ -53,10 +56,6 @@ abstract class RedisSubscriberProvider(system: ActorSystem, clientName: String,
}
}
def publishEvent() {
}
def receive = {
case _ => // do nothing
}

4
bbb-common-web/src/main/scala/org/bigbluebutton/api2/endpoint/redis/WebRedisSubscriberActor.scala
View File

@ -42,9 +42,9 @@ class WebRedisSubscriberActor(
oldMessageEventBus.publish(OldIncomingJsonMessage(fromAkkaAppsOldJsonChannel, receivedJsonMessage))
}
def psubscribed(pattern: String, count: Long): Unit = { log.info("Subscribed to pattern {}", pattern) }
def punsubscribed(pattern: String, count: Long): Unit = { log.info("Unsubscribed to pattern {}", pattern) }
def punsubscribed(pattern: String, count: Long): Unit = { log.info("Unsubscribed from pattern {}", pattern) }
def subscribed(channel: String, count: Long): Unit = { log.info("Subscribed to pattern {}", channel) }
def unsubscribed(channel: String, count: Long): Unit = { log.info("Subscribed to channel {}", channel) }
def unsubscribed(channel: String, count: Long): Unit = { log.info("Unsubscribed from channel {}", channel) }
})
}

1
bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/util/LogHelper.scala
View File

@ -1,6 +1,5 @@
package org.bigbluebutton.app.screenshare.server.util
import org.slf4j.Logger
import org.red5.logging.Red5LoggerFactory
/**