Merge pull request #19 from totem/develop

0.2.1 Relese
totem · Apr 13, 2015 · f8ec0a0 · f8ec0a0
2 parents aafbb06 + 606326a
commit f8ec0a0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/deployer/__init__.py b/deployer/__init__.py
@@ -3,7 +3,7 @@
 from celery.signals import setup_logging
 
 
-__version__ = '0.2'
+__version__ = '0.2.1'
 __author__ = 'sukrit'
 
 deployer.logger.init_logging('root')

diff --git a/deployer/tasks/search.py b/deployer/tasks/search.py
@@ -5,7 +5,7 @@
 import datetime
 from conf.appconfig import DEPLOYMENT_STATE_PROMOTED, \
     DEPLOYMENT_STATE_DECOMMISSIONED, DEPLOYMENT_STATE_STARTED, \
-    DOC_TYPE_DEPLOYMENTS, DOC_TYPE_EVENTS
+    DOC_TYPE_DEPLOYMENTS, DOC_TYPE_EVENTS, API_DEFAULT_PAGE_SIZE
 
 from deployer.celery import app
 from deployer.elasticsearch import deployment_search
@@ -142,11 +142,11 @@ def add_search_event_details(details, event_type, search_params):
 @deployment_search
 def find_apps(es=None, idx=None):
     results = es.search(idx, doc_type=DOC_TYPE_DEPLOYMENTS, body={
-        'size': 0,
         'aggs': {
             'apps': {
                 'terms': {
-                    'field': 'deployment.name'
+                    'field': 'deployment.name',
+                    'size': 0
                 }
             }
         }
@@ -190,7 +190,8 @@ def mark_decommissioned(ids, es=None, idx=None):
 
 
 @deployment_search
-def find_deployments(name, version=None, page=0, size=10, es=None, idx=None):
+def find_deployments(name, version=None, page=0, size=API_DEFAULT_PAGE_SIZE,
+                     es=None, idx=None):
     query = {
         "size": size,
         "from": page,
@@ -206,8 +207,8 @@ def find_deployments(name, version=None, page=0, size=10, es=None, idx=None):
 
 
 @deployment_search
-def find_running_deployments(name, version=None, page=0, size=10, es=None,
-                             idx=None):
+def find_running_deployments(name, version=None, page=0,
+                             size=API_DEFAULT_PAGE_SIZE, es=None, idx=None):
     query = {
         "size": size,
         "from": page,