Merge branch 'hk_now' into 'master'

add logging

See merge request alpha/physical!242

linucb/views/collect_data.py

@@ -166,7 +166,7 @@ class CollectData(object):
                                     if is_online and is_collection == 1:
                                         click_topic_tag_list.append(tag_id)
 
-                                logging.info("click_topic_tag_list:%"%(str(click_topic_tag_list)))
+                                logging.info("click_topic_tag_list:%s"%(str(click_topic_tag_list)))
                                 click_sql_query_results = TopicTag.objects.using(settings.SLAVE_DB_NAME).filter(topic_id=topic_id).values_list("tag_id","is_online")
                                 for tag_id,is_online in click_sql_query_results:
                                     if is_online:
@@ -176,7 +176,7 @@ class CollectData(object):
                                         for id, collection, is_ai in tag_sql_query_results:
                                             if (collection == 1 or is_ai == 1) and id not in click_topic_tag_list:
                                                 click_topic_tag_list.append(id)
-                                logging.info("click_topic_tag_list:%"%(str(click_topic_tag_list)))
+                                logging.info("click_topic_tag_list:%s"%(str(click_topic_tag_list)))
 
 
                                 is_click = 1

trans2es/models/tag.py

@@ -23,7 +23,6 @@ class TopicTag(models.Model):
 
 
 
-
 class AccountUserTag(models.Model):
     class Meta:
         verbose_name=u"用户标签"