Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk

arangod/RestServer/ArangoServer.cpp

@@ -826,6 +826,7 @@ void ArangoServer::buildApplicationServer() {
 }
 
 int ArangoServer::startupServer() {
+  InitializeWorkMonitor();
   TRI_InitializeStatistics();
 
   OperationMode::server_operation_mode_e mode =
@@ -1174,12 +1175,6 @@ int ArangoServer::startupServer() {
   }
 
 
-  // .............................................................................
-  // start the work monitor
-  // .............................................................................
-
-  InitializeWorkMonitor();
-
   // .............................................................................
   // start the main event loop
   // .............................................................................

js/apps/system/_admin/aardvark/APP/frontend/js/templates/arangoTable.ejs

@@ -19,7 +19,14 @@
 
     <% if (content.rows.length === 0) { %>
       <tr>
-        <td>No content.</td><td></td><td></td>
+        <% var xcounter = 0; %>
+        <% _.each(content.titles, function(y) {%>
+          <% if (xcounter === 0) { %>
+            <td>No content.</td>
+          <% } else { %>
+            <td></td>
+          <% } %>
+        <% xcounter++; });%>
       </tr>
     <% }; %>
   </tbody>

js/apps/system/_admin/aardvark/APP/frontend/js/templates/collectionsItemView.ejs

@@ -17,11 +17,15 @@
     <div class="corneredBadge inProgress">
       <%= model.get('desc') %>
     </div>
-  <% } else if (model.get('status') === "loaded" || model.get('status') === 'unloaded') { %>
+  <% } else if (model.get('status') === "loaded" || model.get('status') === 'unloaded' || model.get('status') === 'loading' || model.get('status') === 'unloading') { %>
-    <% if (!model.get('locked')) { %>
+    <% if (!model.get('locked') && model.get("status") !== "loading" && model.get("status") !== "unloading") { %>
       <div class="corneredBadge <%= model.get('status') %>">
         <%= model.get('status') %>
       </div>
+    <% } else if (model.get('status') === 'loading' || model.get('status') === 'unloading') { %>
+      <div class="corneredBadge inProgress">
+        <%= model.get('status') %>
+      </div>
     <% } else { %>
       <div class="corneredBadge inProgress">
         <%= model.get('status') %>

lib/Basics/WorkMonitor.cpp

@@ -601,4 +601,7 @@ void arangodb::InitializeWorkMonitor() {
 /// @brief stops the work monitor
 ////////////////////////////////////////////////////////////////////////////////
 
-void arangodb::ShutdownWorkMonitor() { WORK_MONITOR.beginShutdown(); }
+void arangodb::ShutdownWorkMonitor() {
+  WORK_MONITOR_STOPPED.store(true);
+  WORK_MONITOR.beginShutdown();
+}

scripts/startLocalCluster.sh

@@ -33,7 +33,7 @@ rm -rf cluster
 mkdir cluster
 cd cluster
 echo Starting agency...
-../bin/etcd-arango > /dev/null 2>&1 &
+../build/bin/etcd-arango --data-dir cluster/agency > /dev/null 2>&1 &
 cd ..
 sleep 1
 
@@ -47,7 +47,7 @@ start() {
     PORT=$2
     mkdir cluster/data$PORT
     echo Starting $TYPE on port $PORT
-    bin/arangod --database.directory cluster/data$PORT \
+    build/bin/arangod --database.directory cluster/data$PORT \
                 --cluster.agency-endpoint tcp://127.0.0.1:4001 \
                 --cluster.my-address tcp://127.0.0.1:$PORT \
                 --server.endpoint tcp://127.0.0.1:$PORT \
@@ -58,6 +58,9 @@ start() {
                 --server.disable-statistics true \
                 --server.foxx-queues false \
                 --server.foxx-queues false \
+                --javascript.startup-directory ./js \
+                --server.disable-authentication true \
+                --javascript.app-path ./js/apps \
                 > cluster/$PORT.stdout 2>&1 &
 }
 
@@ -71,7 +74,7 @@ startTerminal() {
     PORT=$2
     mkdir cluster/data$PORT
     echo Starting $TYPE on port $PORT
-    xterm $XTERMOPTIONS -e bin/arangod --database.directory cluster/data$PORT \
+    xterm $XTERMOPTIONS -e build/bin/arangod --database.directory cluster/data$PORT \
                 --cluster.agency-endpoint tcp://127.0.0.1:4001 \
                 --cluster.my-address tcp://127.0.0.1:$PORT \
                 --server.endpoint tcp://127.0.0.1:$PORT \
@@ -81,6 +84,9 @@ startTerminal() {
                 --log.requests-file cluster/$PORT.req \
                 --server.disable-statistics true \
                 --server.foxx-queues false \
+                --javascript.startup-directory ./js \
+                --javascript.app-path ./js/apps \
+                --server.disable-authentication true \
                 --console &
 }
 
@@ -94,7 +100,7 @@ startDebugger() {
     PORT=$2
     mkdir cluster/data$PORT
     echo Starting $TYPE on port $PORT with debugger
-    bin/arangod --database.directory cluster/data$PORT \
+    build/bin/arangod --database.directory cluster/data$PORT \
                 --cluster.agency-endpoint tcp://127.0.0.1:4001 \
                 --cluster.my-address tcp://127.0.0.1:$PORT \
                 --server.endpoint tcp://127.0.0.1:$PORT \
@@ -103,8 +109,11 @@ startDebugger() {
                 --log.file cluster/$PORT.log \
                 --log.requests-file cluster/$PORT.req \
                 --server.disable-statistics true \
+                --javascript.startup-directory ./js \
+                --javascript.app-path ./js/apps \
+                --server.disable-authentication true \
                 --server.foxx-queues false &
-    xterm $XTERMOPTIONS -title "$TYPE $PORT" -e gdb bin/arangod -p $! &
+    xterm $XTERMOPTIONS -title "$TYPE $PORT" -e gdb build/bin/arangod -p $! &
 }
 
 PORTTOPDB=`expr 8629 + $NRDBSERVERS - 1`
@@ -175,6 +184,6 @@ done
 
 echo Done, your cluster is ready at
 for p in `seq 8530 $PORTTOPCO` ; do
-    echo "   bin/arangosh --server.endpoint tcp://127.0.0.1:$p"
+    echo "   build/bin/arangosh --server.endpoint tcp://127.0.0.1:$p"
 done