Merge branch 'gyz' into 'master'

settings.SLAVE

See merge request !479

linucb/views/collect_data.py

@@ -348,7 +348,7 @@ class CollectData(object):
                                 device_id = raw_val_dict["device"]["device_id"]
                                 user_id = raw_val_dict["user_id"] if "user_id" in raw_val_dict else None
                                 if len(tagid_list) > 0:
-                                    tag_query_results = Tag.objects.using(settings.SLAVE_DB_NAME).filter(
+                                    tag_query_results = Tag.objects.using(settings.SLAVE1_DB_NAME).filter(
                                         id__in=tagid_list, is_online=True, is_deleted=False,
                                         is_category=False).values_list("id", flat=True)
                                     is_click = 1