Loading thread fix

.gitignore

@@ -1,4 +1,6 @@
 static/*
 *.pyc
 frontend/static/*
-zsite/static/vendor/*
+zsite/static/vendor/*
+_env/
+media/

app/conf/uwsgi_zuykov.conf.template

@@ -7,7 +7,12 @@ module          = app.wsgi
 home            = /home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/env
 eval            = import newrelic.agent, wsgi; application = newrelic.agent.wsgi_application()(wsgi.application)
 
+<<<<<<< HEAD
 master          = false
+=======
+threads         = 2
+master          = true
+>>>>>>> 71a93f4... loading fix
 processes       = 4
 socket          = /home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/app/wsgi.sock
 chmod-socket    = 666

trademark/views.py

@@ -96,6 +96,7 @@ class SearchResultsThread(threading.Thread):
         loaded = False
         while not loaded:
             loaded = self.keyword.load_results()
+            time.sleep(5)
 
 
 class Search(generic.View):
@@ -143,7 +144,7 @@ class Search(generic.View):
         else:
             return HttpResponse(json.dumps({ 'status': 'error', 'description': 'Empty request'}), content_type="application/json")
 
-        loading = SearchResultsThread(keyword=keyword)
+        loading = SearchResultsThread(keyword=k)
         loading.start()
 
         identity = k.searches.filter(similarity=146)[0]
@@ -173,8 +174,6 @@ class Search(generic.View):
             'status': 'ok'
         }
 
-
-
         return HttpResponse(json.dumps(response), content_type="application/json")