add log

mpusher · Feb 19, 2016 · 3118e6a · 3118e6a
1 parent 731cabe
commit 3118e6a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 71 deletions.
diff --git a/mpush-api/src/main/java/com/shinemo/mpush/api/payload/NotificationPushPayload.java b/mpush-api/src/main/java/com/shinemo/mpush/api/payload/NotificationPushPayload.java
@@ -43,7 +43,7 @@ public NotificationPushPayload setContent(String content) {
 
 	/*****以下非必填**/
     private Long nid; //主要用于聚合通知，非必填
-    private byte flags; //特性字段。 0x01:声音   0x02:震动 0x03:闪灯
+    private Byte flags; //特性字段。 0x01:声音   0x02:震动 0x03:闪灯
     private String largeIcon; // 大图标
     private String ticker; //和title一样
     private Integer number; //
@@ -84,7 +84,11 @@ public NotificationPushPayload setNumber(Integer number) {
 	}
 
 	public NotificationPushPayload setFlag(Flag flag) {
-        this.flags |= flag.getValue();
+		if(this.flags == null){
+			this.flags = flag.getValue();
+		}else{
+			this.flags = (byte) (this.flags.byteValue()|flag.getValue());
+		}
         return this;
     }
 

diff --git a/mpush-api/src/main/java/com/shinemo/mpush/api/payload/PushContent.java b/mpush-api/src/main/java/com/shinemo/mpush/api/payload/PushContent.java
diff --git a/mpush-client/src/main/java/com/shinemo/mpush/push/manage/impl/GatewayServerManage.java b/mpush-client/src/main/java/com/shinemo/mpush/push/manage/impl/GatewayServerManage.java
@@ -38,7 +38,7 @@ public void addOrUpdate(String fullPath,GatewayServerApplication application){
 			application2Client.put(application, client);
 			ip2Client.put(application.getIp(), client);
 		}catch(Exception e){
-
+			log.error("addOrUpdate:{},{}",fullPath,application,e);
 		}
 		printList();
 	}

diff --git a/mpush-test/src/test/java/com/shinemo/mpush/test/connection/client/Main.java b/mpush-test/src/test/java/com/shinemo/mpush/test/connection/client/Main.java
@@ -20,7 +20,7 @@ public static void main(String[] args) throws Exception {
 		int index = (int) ((Math.random() % serverList.size()) * serverList.size());
 		ConnectionServerApplication server = serverList.get(index);
 
-		for(int i = 0;i<3;i++){
+		for(int i = 0;i<1;i++){
 			String clientVersion =  "1.0." + i;
 			String osName = "android";
 			String osVersion = "1.0.1";