Merge remote-tracking branch 'origin/2.3' into 3.0

neo4j · Oct 15, 2015 · 7f8cc66 · 7f8cc66
2 parents aefd0a6 + 5f6c9e9
commit 7f8cc66
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/packaging/standalone/src/main/distribution/shell-scripts/bin/neo4j b/packaging/standalone/src/main/distribution/shell-scripts/bin/neo4j
@@ -143,7 +143,10 @@ detectrunning() {
     ## SmartOS has a different lsof command line arguments
     newpid=$(lsof -o $NEO4J_SERVER_PORT | grep '::' | head -n1 | cut -d ' ' -f 1)
   else
-    newpid=$(lsof -i :$NEO4J_SERVER_PORT -F T -Ts | grep "p")
+    # For some reason, this breaks stuff. Can there be multiple pids?
+    #newpid=$(lsof -i :$NEO4J_SERVER_PORT -F T -Ts | grep "p")
+    # This does NOT work on lsof > 4.87
+    newpid=$(lsof -i :$NEO4J_SERVER_PORT -F T -Ts | grep -i "TST=LISTEN" -B1 | head -n1)
     newpid=${newpid:1}
   fi
 }