Update of /cvsroot/common/include
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv23390

Modified Files:
      Tag: SERVER_14_3
	hxstats.h 
Log Message:
Synopsis
========
This CR fix Bug 270115 Access log display duplicate line with RTSP and RTMP request.

Branch : SERVER_14_3_RN, HEAD
Reviewed by : Chytanya

Description:
==========
Access log display duplicate line with RTSP and RTMP request

192.168.8.144 - - [12/Jan/2012:18:24:03 -0800]  "GET 3gp/Riders-h264.3gp 
RTMP/1.0" 200 821387 [WIN 11,1,102,55] [98280c31-3d8d-11e1-f940-2949b705b19d] 
[UNKNOWN] 946622 26 28 0 0 110
192.168.8.144 - - [12/Jan/2012:18:24:03 -0800]  "GET 3gp/Riders-h264.3gp 
RTMP/1.0" 200 821387 [WIN 11,1,102,55] [98280c31-3d8d-11e1-f940-2949b705b19d] 
[UNKNOWN] 946622 26 28 0 0 110

192.168.8.144 - - [12/Jan/2012:18:25:34 -0800]  "GET 3gp/Riders-h264.3gp 
RTSP/1.0" 200 817510 [WinNT_6.1_12.0.1.669_RealPlayer_R61CNH14_zh-CN_686] 
[cafff281-3d8d-11e1-fd30-672d7a48e6ea] [Stat4:2 
video/H264|N/A|2213|0|17|0|0|;audio/MP4A-LATM|N/A|614|0|7|0|0| 1 1|992892|343| 0

1 7395 26214 0 0|0|0] 946622 26 27 37 5 111
192.168.8.144 - - [12/Jan/2012:18:25:34 -0800]  "GET 3gp/Riders-h264.3gp 
RTSP/1.0" 200 817510 [WinNT_6.1_12.0.1.669_RealPlayer_R61CNH14_zh-CN_686] 
[cafff281-3d8d-11e1-fd30-672d7a48e6ea] [Stat4:2 
video/H264|N/A|2213|0|17|0|0|;audio/MP4A-LATM|N/A|614|0|7|0|0| 1 1|992892|343| 0

1 7395 26214 0 0|0|0] 946622 26 27 37 5 111

STEPS TO REPEAT:
1.Launch flash sample player and Realplayer
2.Set URL:rtmp://192.168.8.110:1935/3gp/Riders-h264.3gp and 
rtsp://192.168.8.110:554/3gp/Riders-h264.3gp, start to play.
3.When playback finish, check the access log

The root cause is:
When I fix bug269943(Playlist should also be logged), I open OnSessionDone log. so it will lead to access log record every session after the session finished.

My fix:
Close OnSessionDone log and add a new log type CSEVENT_HPL_SESSION_DONE for playlist. After one session finished, if its type is play list, I will write a log message into access log file. 
Otherwise, I will never write log message into access log file.

Files affected:
=========
server/engine/context/server_stats.cpp
server/engine/context/pub/server_stats.h
server/admin/monitor/smonplin.cpp
server/engine/session/clientsession.cpp
server/log/tmplgpln/clientstats_log.cpp
server/log/tmplgpln/clientstats_log.h
common/include/hxstats.h

Testing Performed:
================
Unit Tests:

1 test whether playlist written into access log:
Rquesting hpl by vcl player and check rmaccess.log found playlist url can be logged like this :

127.0.0.1 - - [16/Jan/2012:16:28:31 +0800]  "GET 3gp/Desertrace-h264.3gp RTSP/1.0" 200 1291840 [LibVLC/1.1.11 (LIVE555 Streaming Media v2011.05.25)] [f9e821e1-401b-11e1-ea74-25467630843d] [UNKNOWN] 1510907 0 41 0 0 2
127.0.0.1 - - [16/Jan/2012:16:28:58 +0800]  "GET 3gp/Riders-h264.3gp RTSP/1.0" 200 2102740 [LibVLC/1.1.11 (LIVE555 Streaming Media v2011.05.25)] [f9e821e1-401b-11e1-ea74-25467630843d] [UNKNOWN] 946622 0 68 0 0 2
127.0.0.1 - - [16/Jan/2012:16:28:58 +0800]  "GET test.hpl RTSP/1.0" 200 2102740 [LibVLC/1.1.11 (LIVE555 Streaming Media v2011.05.25)] [f9e821e1-401b-11e1-ea74-25467630843d] [UNKNOWN] 946622 0 68 0 0 2
127.0.0.1 - - [16/Jan/2012:16:30:21 +0800]  "GET 3gp/Desertrace-h264.3gp RTSP/1.0" 200 1291840 [LibVLC/1.1.11 (LIVE555 Streaming Media v2011.05.25)] [3ab57ce1-401c-11e1-ee05-9163217d40e6] [UNKNOWN] 1510907 0 42 0 0 3
127.0.0.1 - - [16/Jan/2012:16:30:21 +0800]  "GET test.hpl RTSP/1.0" 200 1291840 [LibVLC/1.1.11 (LIVE555 Streaming Media v2011.05.25)] [3ab57ce1-401c-11e1-ee05-9163217d40e6] [UNKNOWN] 1510907 0 42 0 0 3

2 test whether there is duplicate line:
Play rtsp://192.168.8.110:554/3gp/Riders-h264.3gp with VLC, it is just record once, like this:
127.0.0.1 - - [16/Jan/2012:16:27:27 +0800]  "GET 3gp/Riders-h264.3gp RTSP/1.0" 200 810900 [LibVLC/1.1.11 (LIVE555 Streaming Media v2011.05.25)] [dc6f4581-401b-11e1-ef2c-6b3bd3c1677c] [UNKNOWN] 946622 26 26 0 0 1

Unit Tests: None
Leak Tests: None
Performance Tests: N/A

Platforms Tested: win-x86_64-vc10

Builds Verified: win-x86_64-vc10

QA Hints
========
None



Index: hxstats.h
===================================================================
RCS file: /cvsroot/common/include/hxstats.h,v
retrieving revision 1.40
retrieving revision 1.40.2.1
diff -u -d -r1.40 -r1.40.2.1
--- hxstats.h	27 Oct 2011 17:17:42 -0000	1.40
+++ hxstats.h	17 Jan 2012 06:53:13 -0000	1.40.2.1
@@ -74,7 +74,8 @@
     CSEVENT_SESSION_DONE,
     CSEVENT_TIMER,
     CSEVENT_SESSION_SETURL,
-    CSEVENT_CLIP_DONE
+    CSEVENT_CLIP_DONE,
+    CSEVENT_HPL_SESSION_DONE
 } ClientStatsEvent;
 
 ///////////////////////////////////////////////////////////////////////////////