bug fixes

varchashva · Apr 26, 2019 · c1dcfcf · c1dcfcf
1 parent ea7472d
commit c1dcfcf
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 3 deletions.
diff --git a/core/forms.pyc b/core/forms.pyc
diff --git a/core/models.pyc b/core/models.pyc
diff --git a/core/tasks.pyc b/core/tasks.pyc
diff --git a/core/views.py b/core/views.py
@@ -302,6 +302,10 @@ def action(request, project_id):
         addaction(project_id, "CMDB",str(request.FILES['cmdbfilepath']) + "@" + str(output) + "@" + datetime.datetime.now().strftime("%Y-%m-%d %H:%M"),seednode)
         return redirect("/core/" + str(project_id) + "/action")
     else:
+        if "default" in str(project_id):
+            output = getlocalinfo(project_id)
+            print "Project created: " + output
+            print "Reinitialized DB"
         actionList = listActions(project_id)
         enumList = listEnums(project_id)
         historyList = listHistory(project_id)

diff --git a/core/views.pyc b/core/views.pyc
diff --git a/requirements.txt b/requirements.txt
@@ -7,5 +7,6 @@ scapy
 netifaces
 netaddr
 ipaddress
-celery==4.1.0
-boto==2.49.0
+celery==4.1.1
+boto==2.49.0
+rabbitmq
diff --git a/wait-for-neo4j.sh b/wait-for-neo4j.sh
@@ -3,6 +3,8 @@
 set -e
 host="localhost"
 cmd="$@"
+celerycmd="celery -A LetsMapYourNetwork worker -l warning"
+rabbitmqcmd="rabbitmq-server start"
 
 until curl -sI http://"$host":7474 | grep "200 OK"; do
   >&2 echo "Neo4j isn't available. Let's wait for sometime"
@@ -11,4 +13,11 @@ echo $cmd
 done
 
 >&2 echo "Neo4j is up now. Let's go..."
-exec $cmd
+echo "Starting RabbitMQ Server..."
+$rabbitmqcmd &
+sleep 10
+echo "Starting Celery worker..."
+$celerycmd &
+sleep 5
+echo "Starting Lets Map Your Network console..."
+exec $cmd