Merge branch 'master' of https://github.com/dgraph-io/dgraph-js-http

Author: Paul Korzhyk

.gitignore

@@ -35,3 +35,7 @@ coverage/
 # Misc
 .DS_Store
 Thumbs.db
+
+# Dgraph
+
+data/**

.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 node_js:
-    - "node"
-    - "8"
+  - "node"
+  - "8"
 sudo: required
 dist: trusty
 before_install:

scripts/build.sh

@@ -9,6 +9,8 @@ init
 startZero
 start
 
+sleep 10 # Dgraph need some time to create Groot user
+
 npm run build
 npm test
 

scripts/functions.sh

@@ -7,9 +7,10 @@ fi
 
 function quit {
     echo "Shutting down Dgraph alpha and zero."
-    curl -s localhost:8080/admin/shutdown
-    # Kill Dgraph zero.
-    kill -9 $(pgrep -f "dgraph zero") > /dev/null
+    curl -s localhost:8080/admin/shutdown #TODO In the future this endpoint won't work anymore, in favor of GraphQL. We should prepare it.
+
+    kill -9 $(pgrep -f "dgraph zero") > /dev/null     # Kill Dgraph zero.
+    kill -9 $(pgrep -f "dgraph alpha") > /dev/null    # I don't wanna wait "clean shutdown" on this context. Let's kill it please...
 
     if pgrep -x dgraph > /dev/null
     then
@@ -24,7 +25,7 @@ function quit {
 function start {
     echo -e "Starting Dgraph alpha."
     head -c 1024 /dev/random > data/acl-secret.txt
-    dgraph alpha -p data/p -w data/w --lru_mb 4096 --zero localhost:5080 --acl_secret_file data/acl-secret.txt > data/server.log 2>&1 &
+    dgraph alpha -p data/p -w data/w --lru_mb 4096 --acl_secret_file data/acl-secret.txt > data/alpha.log 2>&1 &
     # Wait for membership sync to happen.
     sleep $sleepTime
     return 0