Merge branch 'hk' into 'master'

add logging

See merge request alpha/physical!287

linucb/views/collect_data.py

@@ -104,7 +104,10 @@ class CollectData(object):
                 if len(recommend_topic_id_list)==0 and cursor==0 and len(redis_topic_list)>0:
                     have_read_topic_id_list.extend(redis_topic_list[:2])
                 if len(tag_id_list) > 0:
-                 tag_topic_id_list = ESPerform.get_tag_topic_list(tag_id_list,have_read_topic_id_list)
+                 if len(new_user_click_tag_list)>0:
+                     tag_topic_id_list = ESPerform.get_tag_topic_list(new_user_click_tag_list, have_read_topic_id_list)
+                 else:
+                     tag_topic_id_list = ESPerform.get_tag_topic_list(tag_id_list,have_read_topic_id_list)
                  logging.warning("tag_topic_id_list:%s"%str(tag_topic_id_list))
                  logging.warning("tag_id_list:%s"%str(tag_id_list))