[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] engine/core core_proc.cpp,1.105,1.106
From:       yijil () helixcommunity ! org
Date:       2012-07-30 2:20:24
[Download RAW message or body]

Update of /cvsroot/server/engine/core
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv24786

Modified Files:
	core_proc.cpp 
Log Message:
Committed to : SERVER_CURRENT_RN, SERVER_15_0_RN

Reviewed by: Richard and James

Synopsis:
=========
Bug 270438: RTMP CDN: can't check status about the upload stream to CDN in monitoring

Branch: SERVER_15_0_RN, HEAD

Suggested Reviewers: Anyone

Description:
============
There is no information for checking status about upload RTMP CDN

My Fix:
Add information in registry for check, then user can access regview.html to check \
stream status. Bellow is information from regview.html.

contents of RTMPPushConnections.Entry1
Name	           Value	                                         Type
AccountName	        Akamai1	                                    Variable
BackupRetryCount	    1	                                        Variable
BackupURL	        rtmp://p.ep27977.i.akamaientrypoint.net/EntryPoint	Variable
BackupState	        OK	                                        Variable
PrimaryRetryCount	    1	                                        Variable
PrimaryURL	        rtmp://b.ep27977.i.akamaientrypoint.net/EntryPoint	Variable
PrimaryState	        OK	                                        Variable
StreamName	        /rtmplive/live/live.mp4	                        Variable


BackupRetryCount means total retry number for BackupURL, it will come back to 0 when \
connect success. BackupState tells whether upload to BackupURL is normal.
PrimaryRetryCount and PrimaryState have the same mean with BackupRetryCount and \
BackupState, but they are for PrimaryURL.

Files affected:
===============
server/engine/core/core_proc.cpp
server_rn/broadcast/transport/rtmp/send/rtmppush.cpp
server_rn/broadcast/transport/rtmp/send/rtmppushevent.cpp
server_rn/broadcast/transport/rtmp/send/pub/rtmppush.h
server_rn/broadcast/transport/rtmp/send/pub/rtmppushconfig.h
server_rn/broadcast/transport/rtmp/send/pub/rtmppushevent.h

Testing Performed:
================
Leak Tests: None
Performance Tests: N/A

Platforms Tested: Win32

QA Hints
========
None.



Index: core_proc.cpp
===================================================================
RCS file: /cvsroot/server/engine/core/core_proc.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- core_proc.cpp	4 Jul 2012 03:15:18 -0000	1.105
+++ core_proc.cpp	30 Jul 2012 02:19:59 -0000	1.106
@@ -907,6 +907,22 @@
 
     proc->pc->named_lock_manager->CreateNamedLock("LiveConnectionsLock");
 
+    /*
+     * Add key for rtmppush plugins to register their connections
+     */
+    hxreg->AddComp("RTMPPushConnections");
+    hxreg->AddInt("RTMPPushConnections.Index", 0);
+    hxreg->AddInt("RTMPPushConnections.Count", 0);
+    proc->pc->named_lock_manager->CreateNamedLock("RTMPPushConnectionsLock");
+
+    /*
+     * Add key for push2cdn plugins to register their connections
+     */
+    hxreg->AddComp("Push2CDNConnections");
+    hxreg->AddInt("Push2CDNConnections.Index", 0);
+    hxreg->AddInt("Push2CDNConnections.Count", 0);
+    proc->pc->named_lock_manager->CreateNamedLock("Push2CDNConnectionsLock");
+
     INT32* pEncoders = new INT32;
     IHXBuffer* pIHXBuf = new ServerBuffer(TRUE);
     HX_ASSERT(pIHXBuf);


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs


[prev in list] [next in list] [prev in thread] [next in thread]