Fixed some minor bugs.

Author: malcolmmackay

backendapp/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

backendapp/api/admin/tags.py

@@ -67,7 +67,7 @@ def get(self, id):
 
         frontendurl = parsedargs['frontendurl']
         nsamples = int(parsedargs.get('nsamples', 100))
-        smplintervalmins = int(parsedargs.get('sampleintervalmins', 10))
+        smplintervalmins = int(parsedargs.get('smplintervalmins', 10))
         format = int(parsedargs.get('format', 1))
         usehmac = (parsedargs.get('usehmac', 'True').lower() == 'true')
         batvoltagemv = int(parsedargs.get('batvoltagemv', 3000))

backendapp/api/consumer/captures.py

@@ -101,8 +101,8 @@ def get(self):
                                               optlist=['page', 'per_page'])
 
         serial = parsedargs['serial']
-        page = parsedargs.get('page', 1)
-        per_page = parsedargs.get('per_page', 10)
+        page = int(parsedargs.get('page', 1))
+        per_page = int(parsedargs.get('per_page', 10))
 
         tagobj = tags.get_by_serial(serial)
         capturepages = tagobj.captures.options(noload('samples')).paginate(page=page, per_page=per_page, max_per_page=25)

backendapp/config.py

@@ -43,7 +43,7 @@
 HASHIDS_SALT = os.environ['HASHIDS_SALT']
 HASHIDS_OFFSET = int(os.getenv('HASHIDS_OFFSET', defaults.HASHIDS_OFFSET))
 
-DROP_ON_INIT = bool(os.getenv('DROP_ON_INIT', defaults.DROP_ON_INIT)) # Flag to drop tables on startup.
+DROP_ON_INIT = (os.getenv('DROP_ON_INIT', defaults.DROP_ON_INIT).lower() == 'true')  # Flag to drop tables on startup.
 
 TAGTOKEN_CLIENTID = os.getenv('TAGTOKEN_CLIENTID', defaults.TAGTOKEN_CLIENTID)
 TAGTOKEN_CLIENTSECRET = os.environ['TAGTOKEN_CLIENTSECRET']
@@ -53,8 +53,8 @@
 ADMINAPI_CLIENTSERET = os.environ['ADMINAPI_CLIENTSECRET']
 
 RATELIMIT_DEFAULT = os.environ.get('RATELIMIT_DEFAULT', defaults.RATELIMIT_DEFAULT)
-RATELIMIT_HEADERS_ENABLED = os.getenv('RATELIMIT_HEADERS_ENABLED', defaults.RATELIMIT_HEADERS_ENABLED)
-RATELIMIT_ENABLED = os.getenv('RATELIMIT_ENABLED', defaults.RATELIMIT_ENABLED)
+RATELIMIT_HEADERS_ENABLED = (os.getenv('RATELIMIT_HEADERS_ENABLED', defaults.RATELIMIT_HEADERS_ENABLED).lower() == 'true')
+RATELIMIT_ENABLED = (os.getenv('RATELIMIT_ENABLED', defaults.RATELIMIT_ENABLED).lower() == 'true')
 RATELIMIT_STORAGE_URL = os.getenv('RATELIMIT_STORAGE_URL', defaults.RATELIMIT_STORAGE_URL)
 RATELIMIT_STRATEGY = os.getenv('RATELIMIT_STRATEGY', defaults.RATELIMIT_STRATEGY)
 

backendapp/defaults.py

@@ -1,13 +1,13 @@
 ADMINAPI_AUDIENCE = "default_adminapi_audience"
 ADMINAPI_CLIENTID = "default_adminapi_clientid"
 TAGTOKEN_CLIENTID = "default_tagtoken_clientid"
-RATELIMIT_HEADERS_ENABLED = True
-RATELIMIT_ENABLED = False
+RATELIMIT_HEADERS_ENABLED = 'True'
+RATELIMIT_ENABLED = 'False'
 RATELIMIT_STORAGE_URL = "memory://"
 RATELIMIT_DEFAULT = "80/hour,100/day,2000/year"
 RATELIMIT_STRATEGY = "fixed-window-elastic-expiry"
 HASHIDS_OFFSET = 0
-DROP_ON_INIT = False
+DROP_ON_INIT = 'False'
 WSB_PORT = 5000
 WSB_HOST = "localhost"
 WSB_PROTOCOL = "http://"