Merge pull request #31 from red5pro/develop

Develop
red5pro · Mar 31, 2021 · b84b9ee · b84b9ee
2 parents 2ab73c0 + 3a3320f
commit b84b9ee
Show file tree

Hide file tree

Showing 10 changed files with 93 additions and 110 deletions.
diff --git a/conf/deprecated/jee-container-ssl.xml b/conf/deprecated/jee-container-ssl.xml
@@ -16,9 +16,8 @@
     <!-- Non-secured transports for HTTP and WS -->
     <!--
     <bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" depends-on="context.loader,warDeployer" lazy-init="true">
-
+        <property name="websocketEnabled" value="true" />
         <property name="webappFolder" value="${red5.root}/webapps" />
-        
         <property name="connectors">
             <list>
                 <bean name="httpConnector" class="org.red5.server.tomcat.TomcatConnector">
@@ -27,21 +26,29 @@
                     <property name="redirectPort" value="${https.port}" />
                     <property name="connectionProperties">
                         <map>
+                            <entry key="port" value="${http.port}" />
+                            <entry key="redirectPort" value="${https.port}" />
                             <entry key="maxHttpHeaderSize" value="${http.max_headers_size}"/>
                             <entry key="maxKeepAliveRequests" value="${http.max_keep_alive_requests}"/>
                             <entry key="keepAliveTimout" value="-1"/>
+                            <entry key="useExecutor" value="true"/>
+                            <entry key="maxThreads" value="${http.max_threads}"/>
+                            <entry key="acceptCount" value="100"/>
+                            <entry key="acceptorThreadCount" value="${http.acceptor_thread_count}"/>
+                            <entry key="processorCache" value="${http.processor_cache}"/>
+                            <entry key="connectionTimeout" value="20000"/>
+                            <entry key="maxConnections" value="-1"/>
+                            <entry key="relaxedQueryChars" value="[,]"/>
                         </map>
                     </property>
                 </bean>
             </list>
         </property>
-        
         <property name="baseHost">
            <bean class="org.apache.catalina.core.StandardHost">
                <property name="name" value="${http.host}" />
            </bean>
         </property>
-
         <property name="valves">
             <list>
                 <bean id="valve.access" class="org.apache.catalina.valves.AccessLogValve">
@@ -53,24 +60,13 @@
                 </bean>
             </list>
         </property>
-        
-    </bean>
-
-    <bean id="webSocketTransport" class="org.red5.net.websocket.WebSocketTransport">
-        <property name="addresses">
-            <list>
-                <value>${ws.host}:${ws.port}</value>
-            </list>
-        </property>
     </bean>
-	-->
-
+-->
     <!-- Secure transports for HTTPS and WSS -->
 
     <bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" depends-on="context.loader" lazy-init="true">
-
+        <property name="websocketEnabled" value="true" />
         <property name="webappFolder" value="${red5.root}/webapps" />
-
         <property name="connectors">
             <list>
                 <bean name="httpConnector" class="org.red5.server.tomcat.TomcatConnector">
@@ -104,55 +100,17 @@
                             <entry key="maxThreads" value="${http.max_threads}"/>
                             <entry key="acceptorThreadCount" value="${http.acceptor_thread_count}"/>
                             <entry key="processorCache" value="${http.processor_cache}"/>
+                            <entry key="relaxedQueryChars" value="[,]"/>
                         </map>
                     </property>
                 </bean>
             </list>
         </property>
-
         <property name="baseHost">
             <bean class="org.apache.catalina.core.StandardHost">
                 <property name="name" value="${http.host}" />
             </bean>
         </property>
-
-    </bean>
-
-    <bean id="webSocketTransportSecure" class="org.red5.net.websocket.WebSocketTransport">
-        <property name="receiveBufferSize" value="4096"/>
-        <property name="handshakeWriteTimeout" value="10000"/>
-        <property name="latchTimeout" value="10000"/>
-        <property name="secureConfig">
-            <bean id="webSocketSecureConfig" class="org.red5.net.websocket.SecureWebSocketConfiguration">
-                <property name="keystoreFile" value="${rtmps.keystorefile}"/>
-                <property name="keystorePassword" value="${rtmps.keystorepass}"/>
-                <property name="truststoreFile" value="${rtmps.truststorefile}"/>
-                <property name="truststorePassword" value="${rtmps.truststorepass}"/>
-                <property name="cipherSuites">
-                    <array>
-                        <value>TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256</value>
-                        <value>TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256</value>
-                        <value>TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA</value>
-                        <value>TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256</value>
-                        <value>TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256</value>
-                        <value>TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA</value>
-                        <value>TLS_RSA_WITH_AES_128_GCM_SHA256</value>
-                        <value>TLS_RSA_WITH_AES_128_CBC_SHA256</value>
-                        <value>TLS_RSA_WITH_AES_128_CBC_SHA</value>
-                    </array>
-                </property>
-                <property name="protocols">
-                    <array>
-                        <value>TLSv1.2</value>
-                    </array>
-                </property>
-            </bean>
-        </property>
-        <property name="addresses">
-            <list>
-                <value>${wss.host}:${wss.port}</value>
-            </list>
-        </property>
     </bean>
 
 </beans>
diff --git a/conf/deprecated/red5-ssl.properties b/conf/deprecated/red5-ssl.properties
@@ -9,9 +9,9 @@ https.port=443
 http.URIEncoding=UTF-8
 http.max_headers_size=8192
 http.max_keep_alive_requests=-1
-http.max_threads=20
-http.acceptor_thread_count=10
-http.processor_cache=20
+http.max_threads=2000
+http.acceptor_thread_count=100
+http.processor_cache=200
 
 # RTMP
 rtmp.host=0.0.0.0
@@ -42,12 +42,12 @@ rtmp.default_acceptor=true
 # socket i/o pool sizes used when default acceptor is disabled
 rtmp.initial_pool_size=0
 rtmp.max_pool_size=2
-rtmp.max_processor_pool_size=16
+rtmp.max_processor_pool_size=8
 rtmp.executor_keepalive_time=60000
 mina.logfilter.enable=false
 # scheduler configs (per application)
-rtmp.scheduler.pool_size=16
-rtmp.deadlockguard.sheduler.pool_size=16
+rtmp.scheduler.pool_size=8
+rtmp.deadlockguard.sheduler.pool_size=8
 # message executor configs (per application) - adjust these as needed if you get tasks rejected
 rtmp.executor.core_pool_size=4
 rtmp.executor.max_pool_size=32
@@ -74,10 +74,9 @@ rtmps.port=8443
 rtmps.ping_interval=5000
 rtmps.max_inactivity=60000
 rtmps.max_keep_alive_requests=-1
-rtmps.max_threads=20
+rtmps.max_threads=8
 rtmps.acceptor_thread_count=2
 rtmps.processor_cache=20
-
 # RTMPS Key and Trust store parameters
 rtmps.keystorepass=password
 rtmps.keystorefile=conf/keystore.jks
@@ -91,7 +90,7 @@ rtmpt.ping_interval=5000
 rtmpt.max_inactivity=60000
 rtmpt.max_handshake_time=5000
 rtmpt.max_keep_alive_requests=-1
-rtmpt.max_threads=20
+rtmpt.max_threads=8
 rtmpt.acceptor_thread_count=2
 rtmpt.processor_cache=20
 rtmpt.encoder_base_tolerance=5000
@@ -107,12 +106,6 @@ rtmpt.max_queue_offer_time=125
 # max offer attempts
 rtmpt.max_queue_offer_attempts=4
 
-# WebSocket
-ws.host=0.0.0.0
-ws.port=8081
-wss.host=0.0.0.0
-wss.port=8083
-
 # Debug proxy (needs to be activated in red5-core.xml)
 proxy.source_host=127.0.0.1
 proxy.source_port=1936
@@ -127,15 +120,15 @@ jmx.rmi.port.remoteobjects=
 jmx.keystorepass=password
 jmx.mina.monitor.enable=false
 jmx.mina.poll.interval=1000
-# Whether to always create the registry in-process, not attempting to 
+# Whether to always create the registry in-process, not attempting to
 # locate an existing registry at the specified port. Set to "true" in order
 # to avoid the overhead of locating an existing registry when you always intend
 # to create a new registry in any case.
 jmx.registry.create=true
-# Whether or not the MBeanServerFactoryBean should attempt to locate a running 
+# Whether or not the MBeanServerFactoryBean should attempt to locate a running
 # MBeanServer before creating one
 jmx.reuse.existing.server=true
-# Whether to register the MBeanServer with the MBeanServerFactory, making it 
+# Whether to register the MBeanServer with the MBeanServerFactory, making it
 # available through MBeanServerFactory.findMBeanServer()
 jmx.register.factory=true
 # Whether any threads started for the JMXConnectorServer should be started as daemon threads

diff --git a/conf/jee-container-ssl.xml b/conf/jee-container-ssl.xml
@@ -14,7 +14,7 @@
     </bean>
 
     <!-- Non-secured transports for HTTP and WS -->
-    <!-- 
+    <!--
     <bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" depends-on="context.loader,warDeployer" lazy-init="true">
         <property name="websocketEnabled" value="true" />
         <property name="webappFolder" value="${red5.root}/webapps" />
@@ -26,9 +26,19 @@
                     <property name="redirectPort" value="${https.port}" />
                     <property name="connectionProperties">
                         <map>
+                            <entry key="port" value="${http.port}" />
+                            <entry key="redirectPort" value="${https.port}" />
                             <entry key="maxHttpHeaderSize" value="${http.max_headers_size}"/>
                             <entry key="maxKeepAliveRequests" value="${http.max_keep_alive_requests}"/>
                             <entry key="keepAliveTimout" value="-1"/>
+                            <entry key="useExecutor" value="true"/>
+                            <entry key="maxThreads" value="${http.max_threads}"/>
+                            <entry key="acceptCount" value="100"/>
+                            <entry key="acceptorThreadCount" value="${http.acceptor_thread_count}"/>
+                            <entry key="processorCache" value="${http.processor_cache}"/>
+                            <entry key="connectionTimeout" value="20000"/>
+                            <entry key="maxConnections" value="-1"/>
+                            <entry key="relaxedQueryChars" value="[,]"/>
                         </map>
                     </property>
                 </bean>
@@ -89,6 +99,7 @@
                             <entry key="maxThreads" value="${http.max_threads}"/>
                             <entry key="acceptorThreadCount" value="${http.acceptor_thread_count}"/>
                             <entry key="processorCache" value="${http.processor_cache}"/>
+                            <entry key="relaxedQueryChars" value="[,]"/>
                         </map>
                     </property>
                 </bean>

diff --git a/conf/jee-container.xml b/conf/jee-container.xml
@@ -25,9 +25,19 @@
                     <property name="redirectPort" value="${https.port}" />
                     <property name="connectionProperties">
                         <map>
+                            <entry key="port" value="${http.port}" />
+                            <entry key="redirectPort" value="${https.port}" />
                             <entry key="maxHttpHeaderSize" value="${http.max_headers_size}"/>
                             <entry key="maxKeepAliveRequests" value="${http.max_keep_alive_requests}"/>
                             <entry key="keepAliveTimout" value="-1"/>
+                            <entry key="useExecutor" value="true"/>
+                            <entry key="maxThreads" value="${http.max_threads}"/>
+                            <entry key="acceptCount" value="100"/>
+                            <entry key="acceptorThreadCount" value="${http.acceptor_thread_count}"/>
+                            <entry key="processorCache" value="${http.processor_cache}"/>
+                            <entry key="connectionTimeout" value="20000"/>
+                            <entry key="maxConnections" value="-1"/>
+                            <entry key="relaxedQueryChars" value="[,]"/>
                         </map>
                     </property>
                 </bean>
@@ -89,6 +99,7 @@
                             <entry key="maxThreads" value="${http.max_threads}"/>
                             <entry key="acceptorThreadCount" value="${http.acceptor_thread_count}"/>
                             <entry key="processorCache" value="${http.processor_cache}"/>
+                            <entry key="relaxedQueryChars" value="[,]"/>
                         </map>
                     </property>
                 </bean>

diff --git a/conf/red5-ssl.properties b/conf/red5-ssl.properties
@@ -9,9 +9,9 @@ https.port=443
 http.URIEncoding=UTF-8
 http.max_headers_size=8192
 http.max_keep_alive_requests=-1
-http.max_threads=20
-http.acceptor_thread_count=10
-http.processor_cache=20
+http.max_threads=2000
+http.acceptor_thread_count=100
+http.processor_cache=200
 
 # RTMP
 rtmp.host=0.0.0.0
@@ -120,15 +120,15 @@ jmx.rmi.port.remoteobjects=
 jmx.keystorepass=password
 jmx.mina.monitor.enable=false
 jmx.mina.poll.interval=1000
-# Whether to always create the registry in-process, not attempting to 
+# Whether to always create the registry in-process, not attempting to
 # locate an existing registry at the specified port. Set to "true" in order
 # to avoid the overhead of locating an existing registry when you always intend
 # to create a new registry in any case.
 jmx.registry.create=true
-# Whether or not the MBeanServerFactoryBean should attempt to locate a running 
+# Whether or not the MBeanServerFactoryBean should attempt to locate a running
 # MBeanServer before creating one
 jmx.reuse.existing.server=true
-# Whether to register the MBeanServer with the MBeanServerFactory, making it 
+# Whether to register the MBeanServer with the MBeanServerFactory, making it
 # available through MBeanServerFactory.findMBeanServer()
 jmx.register.factory=true
 # Whether any threads started for the JMXConnectorServer should be started as daemon threads

diff --git a/conf/red5.properties b/conf/red5.properties
@@ -9,9 +9,9 @@ https.port=5443
 http.URIEncoding=UTF-8
 http.max_headers_size=8192
 http.max_keep_alive_requests=-1
-http.max_threads=20
-http.acceptor_thread_count=10
-http.processor_cache=20
+http.max_threads=2000
+http.acceptor_thread_count=100
+http.processor_cache=200
 
 # RTMP
 rtmp.host=0.0.0.0
@@ -120,15 +120,15 @@ jmx.rmi.port.remoteobjects=
 jmx.keystorepass=password
 jmx.mina.monitor.enable=false
 jmx.mina.poll.interval=1000
-# Whether to always create the registry in-process, not attempting to 
+# Whether to always create the registry in-process, not attempting to
 # locate an existing registry at the specified port. Set to "true" in order
 # to avoid the overhead of locating an existing registry when you always intend
 # to create a new registry in any case.
 jmx.registry.create=true
-# Whether or not the MBeanServerFactoryBean should attempt to locate a running 
+# Whether or not the MBeanServerFactoryBean should attempt to locate a running
 # MBeanServer before creating one
 jmx.reuse.existing.server=true
-# Whether to register the MBeanServer with the MBeanServerFactory, making it 
+# Whether to register the MBeanServer with the MBeanServerFactory, making it
 # available through MBeanServerFactory.findMBeanServer()
 jmx.register.factory=true
 # Whether any threads started for the JMXConnectorServer should be started as daemon threads

diff --git a/conf/startred5pro.sh b/conf/startred5pro.sh
@@ -0,0 +1,3 @@
+#! /bin/bash
+sudo systemctl start red5pro
+tail -f /usr/local/red5pro/log/red5.log
diff --git a/conf/stopred5pro.sh b/conf/stopred5pro.sh
@@ -0,0 +1,2 @@
+#! /bin/bash
+sudo systemctl stop red5pro
diff --git a/conf/tail.sh b/conf/tail.sh
@@ -0,0 +1,2 @@
+#! /bin/bash
+tail -f /usr/local/red5pro/log/red5.log
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#! /bin/bash
		tail -f /usr/local/red5pro/log/red5.log