Merge remote-tracking branch 'origin/feat-database-indexing' into feat-delete-collection-attributes-indexes

.travis.yml

@@ -39,6 +39,12 @@ install:
 
 script:
 - docker ps -a
+# Tests should fail if any container is in exited status
+- ALL_UP=`docker ps -aq --filter "status=exited"`
+- >
+  if [[ "$ALL_UP" != "" ]]; then
+    exit 1
+  fi
 - docker-compose logs appwrite
 - docker-compose logs mariadb
 - docker-compose logs appwrite-worker-functions

app/tasks/maintenance.php

@@ -42,7 +42,7 @@ $cli
         function notifyDeleteUsageStats(int $interval30m, int $interval1d) 
         {
             Resque::enqueue(Event::DELETE_QUEUE_NAME, Event::DELETE_CLASS_NAME, [
-                'type' => DELETE_TYPE_USAGE_STATS,
+                'type' => DELETE_TYPE_USAGE,
                 'timestamp1d' => time() - $interval1d,
                 'timestamp30m' => time() - $interval30m,
             ]);

app/workers/deletes.php

@@ -82,7 +82,7 @@ class DeletesV1 extends Worker
                 $this->deleteCertificates($document);
                 break;
 
-            case DELETE_TYPE_USAGE_STATS:
+            case DELETE_TYPE_USAGE:
                 $this->deleteUsageStats($this->args['timestamp1d'], $this->args['timestamp30m']);
                 break;
             default: