添加关键操作日志

刘基城
1 parent 6d2d8bdf
Showing 5 changed files with 66 additions and 14 deletions
src/main/java/com/cnlive/mz/live/action/HttpPostArgumentTest2.java
src/main/java/com/cnlive/mz/live/action/VideoAction.java
src/main/resources/log4j.properties
target/classes/log4j.properties
target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
@@ -67,7 +67,7 @@ public class HttpPostArgumentTest2 {
 		NameValuePair[] param = { new NameValuePair("relation_id", "283645"), new NameValuePair("video_type", "3"),
 				new NameValuePair("user_access_key", user_access_key),
 				new NameValuePair("app_access_key", app_access_key) };
-		String c = HttpReq.postRequestWidthResult("http://bc.cnlive.com/api/video/redirect", param);
+		String c = HttpReq.postRequestWidthResult("http://localhost:8080/cnlive_live_web/api/video/redirect", param);
 		System.out.println(c);
 	}
@@ -5,6 +5,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
 import org.smart4j.framework.dao.bean.Pager;
 import org.smart4j.framework.ioc.annotation.Inject;
 import org.smart4j.framework.mvc.DataContext;
@@ -17,6 +18,7 @@ import org.smart4j.framework.mvc.bean.View;
 import org.smart4j.framework.util.CastUtil;
 import com.cnlive.mz.commons.CnliveUtil;
+import com.cnlive.mz.live.common.Constants;
 import com.cnlive.mz.live.common.LiveUtils;
 import com.cnlive.mz.live.entity.TLive;
 import com.cnlive.mz.live.entity.TVideo;
@@ -27,6 +29,8 @@ import com.cnlive.mz.live.service.TVideoService;
 @Action
 public class VideoAction {
+
+	private Logger log = Logger.getLogger("action");
 	@Inject
 	private TDispatchServerService tDispatchServerService;
 	@Inject
@@ -63,6 +67,9 @@ public class VideoAction {
 		String server_access_key = params.getString("server_access_key");
 		String active_id = params.getString("active_id");
 		String title = params.getString("title");
+		if (title.length() > 50) {
+			title = title.substring(0, 50);
+		}
 		String direct = params.getString("direct");
 		String description = params.getString("description");
 		String custom_args = params.getString("custom_args");
@@ -99,10 +106,7 @@ public class VideoAction {
 			} else {
 				tLive.setDirect(Integer.parseInt(direct));
 			}
-			// tLive.setLive_url("http://cnlive.hlslive.ks-cdn.com/live/" +
-			// tLive.getT_user_id() + "_" + uuid
-			// + "/index.m3u8");
-			tLive.setLive_url("rtmp://cnlive.rtmplive.ks-cdn.com/live/" + tLive.getT_user_id() + "_" + uuid);
+			tLive.setLive_url(Constants.KS_HOST_RTMP + tLive.getT_user_id() + "_" + uuid);
 			tLiveService.startLive(tLive);
 		}
 		data.put("video_uuid", uuid);
@@ -172,12 +176,14 @@ public class VideoAction {
 		String upload_type = params.getString("upload_type");
 		String video_type = params.getString("video_type");
 		String state = params.getString("state");
+		String duration = params.getString("duration");
+		xLog("uploadNotify", "duration", duration, video_type, video_type,state);
 		if (video_type.equals("2")) {
 			// 点播通知
 			tVideoService.notify(video_uuid);
 		} else if (video_type.equals("3")) {
-			// 直播通知
-			tLiveService.notify(video_uuid);
+			// 直播正常结束
+			tLiveService.notify(video_uuid, duration, 2);
 		}
 		ApiBean apiBean = new ApiBean();
 		apiBean.setCode(100);
@@ -186,9 +192,9 @@ public class VideoAction {
 	}
 	@Request.Get("/api/video/error/{video_uuid}")
-	public ApiBean beat(String video_uuid) {
-		// 直播通知
-		tLiveService.notify(video_uuid);
+	public ApiBean error(String video_uuid) {
+		// 直播异常结束
+		tLiveService.notify(video_uuid, "-1", -2);
 		ApiBean apiBean = new ApiBean();
 		apiBean.setCode(100);
 		apiBean.setMessage("请求成功");
@@ -207,4 +213,13 @@ public class VideoAction {
 		apiBean.setMessage("请求成功");
 		return apiBean;
 	}
+
+	private void xLog(String... str) {
+		StringBuffer sb = new StringBuffer();
+		for (int i = 0; i < str.length; i++) {
+			sb.append(str);
+			sb.append("|");
+		}
+		log.info(sb.toString());
+	}
 }
 log4j.rootLogger=INFO,console,file
-
+log4j.logger.content=INFO,content
+log4j.logger.video=INFO,video
 log4j.appender.console=org.apache.log4j.ConsoleAppender
 log4j.appender.console.Target=System.out
 log4j.appender.console.layout=org.apache.log4j.PatternLayout
@@ -16,6 +17,24 @@ log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} %p %c (%L) - %m%n
 log4j.logger.org.smart4j=DEBUG
+#content
+log4j.appender.content=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.content.File=${catalina.home}/logs/content.log
+log4j.appender.content.layout=org.apache.log4j.PatternLayout
+log4j.appender.content.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %5p [%t] %C{1} - %m%n
+log4j.appender.content.DatePattern='.'yyyy-MM-dd
+log4j.appender.content.Encoding=UTF-8
+
+
+#video
+log4j.appender.video=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.video.File=${catalina.home}/logs/video.log
+log4j.appender.video.layout=org.apache.log4j.PatternLayout
+log4j.appender.video.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %5p [%t] %C{1} - %m%n
+log4j.appender.video.DatePattern='.'yyyy-MM-dd
+log4j.appender.video.Encoding=UTF-8
+
+
 #log4j.logger.com.ksyun.ks3=DEBUG,stdout
 #log4j.logger.org.apache.http=DEBUG,stdout
 #log4j.logger.org.apache.http.wire=ERROR,stdout
 log4j.rootLogger=INFO,console,file
-
+log4j.logger.content=INFO,content
+log4j.logger.video=INFO,video
 log4j.appender.console=org.apache.log4j.ConsoleAppender
 log4j.appender.console.Target=System.out
 log4j.appender.console.layout=org.apache.log4j.PatternLayout
@@ -16,6 +17,24 @@ log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} %p %c (%L) - %m%n
 log4j.logger.org.smart4j=DEBUG
+#content
+log4j.appender.content=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.content.File=${catalina.home}/logs/content.log
+log4j.appender.content.layout=org.apache.log4j.PatternLayout
+log4j.appender.content.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %5p [%t] %C{1} - %m%n
+log4j.appender.content.DatePattern='.'yyyy-MM-dd
+log4j.appender.content.Encoding=UTF-8
+
+
+#video
+log4j.appender.video=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.video.File=${catalina.home}/logs/video.log
+log4j.appender.video.layout=org.apache.log4j.PatternLayout
+log4j.appender.video.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss}] %5p [%t] %C{1} - %m%n
+log4j.appender.video.DatePattern='.'yyyy-MM-dd
+log4j.appender.video.Encoding=UTF-8
+
+
 #log4j.logger.com.ksyun.ks3=DEBUG,stdout
 #log4j.logger.org.apache.http=DEBUG,stdout
 #log4j.logger.org.apache.http.wire=ERROR,stdout
 #Generated by Maven Integration for Eclipse
-#Tue Jun 14 14:04:42 CST 2016
-#Sun Jun 12 10:48:48 CST 2016
+#Thu Jun 16 09:01:40 CST 2016
 version=0.0.1-SNAPSHOT
 groupId=com.cnlive.mz.live.web
 m2e.projectName=cnlive_live_web