Updates for 1.2.9

Red5 · Nov 26, 2021 · c29ba56 · c29ba56
2 parents fddd470 + f783547
commit c29ba56
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/src/main/java/org/red5/server/api/Red5.java b/src/main/java/org/red5/server/api/Red5.java
@@ -68,8 +68,12 @@ public final class Red5 {
     public static final Integer CAPABILITIES = Integer.valueOf(33);
 
     /**
+    <<<<<<< HEAD
      * Target for ChunkSize messaging in RTMP. Defaulting to 128 which is the original FMS setting, until modifying this is more
      * throughly tested.
+    =======
+     * Since 128 is the default when publish or play are called; changing this may cause unexpected issues.
+    >>>>>>> f78354776c35ad921077113bd88a00cdd7e951d8
      */
     public static int targetChunkSize = 128;
 

diff --git a/src/main/java/org/red5/server/net/rtmp/RTMPConnection.java b/src/main/java/org/red5/server/net/rtmp/RTMPConnection.java
@@ -555,10 +555,14 @@ private void startRoundTripMeasurement() {
                         log.debug("Keep alive scheduled for {}", sessionId);
                     }
                 } catch (Exception e) {
-                    log.error("Error creating keep alive job for {}", sessionId, e);
+                    log.warn("Error creating keep alive job for {}", sessionId, e);
                 }
             }
         } else {
+<<<<<<< HEAD
+=======
+            // reducing from error to debug as its not all that important of a message these days to have such promotion
+>>>>>>> f78354776c35ad921077113bd88a00cdd7e951d8
             log.debug("startRoundTripMeasurement cannot be executed due to missing scheduler. This can happen if a connection drops before handshake is complete");
         }
     }

diff --git a/src/main/java/org/red5/server/net/rtmp/RTMPHandler.java b/src/main/java/org/red5/server/net/rtmp/RTMPHandler.java
@@ -539,9 +539,13 @@ protected void onPing(RTMPConnection conn, Channel channel, Header source, Ping
                 conn.pingReceived(ping);
                 break;
             default:
+<<<<<<< HEAD
                 if (isDebug) {
                     log.warn("Unhandled ping: {}", ping);
                 }
+=======
+                log.debug("Unhandled ping: {}", ping);
+>>>>>>> f78354776c35ad921077113bd88a00cdd7e951d8
         }
     }
 

diff --git a/src/main/java/org/red5/server/stream/ClientBroadcastStream.java b/src/main/java/org/red5/server/stream/ClientBroadcastStream.java
@@ -175,7 +175,7 @@ public class ClientBroadcastStream extends AbstractClientStream implements IClie
     /**
      * Whether or not to register with JMX.
      */
-    private boolean registerJMX = true;
+    protected boolean registerJMX = true;
 
     /**
      * Check and send notification if necessary