From 0b573f86db6bf8fc60654a943e78bf32682071e5 Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Mon, 6 Apr 2020 11:50:06 -0700 Subject: [PATCH 01/27] Remove comments from bgroup. --- app/controllers/bgroup.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/bgroup.py b/app/controllers/bgroup.py index 1ef19ee..7aadb68 100644 --- a/app/controllers/bgroup.py +++ b/app/controllers/bgroup.py @@ -18,14 +18,12 @@ class BGroupController(RestController): def index(self, filter_data): """Get a query for all models matching filter_data.""" - current_app.logger.info('Checking global permissions') + # Adding Logs to test deployment if 'read_all::BGroup' in g.user_permissions: - current_app.logger.info(filter_data) return super().index(filter_data) - current_app.logger.info('Fetch and check if user has access if not global') user_groups = g.get('user_groups', None) user_group_ids = [group_id for group_id in user_groups] - + # Query to select groups for external users query = ''' SELECT bgroup.id, name, priority, time_created, time_modified, user_created, user_modified from groups.bgroup JOIN groups.bgroup_user_group on groups.bgroup.id = groups.bgroup_user_group.bgroup_id -- GitLab From 12bcb3d47cc43ecd843747b58dd2362e9b681d3f Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Mon, 6 Apr 2020 11:57:45 -0700 Subject: [PATCH 02/27] Remove comments from bgroup. --- app/views/bgroup.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/views/bgroup.py b/app/views/bgroup.py index 07e784a..17f0a1c 100644 --- a/app/views/bgroup.py +++ b/app/views/bgroup.py @@ -30,10 +30,7 @@ class BuildingBGroupView(RestView): @route('/', methods=['GET']) def get(self, bgroup_id): """Get buildings within a bgroup""" - current_app.logger.info("in the view") buildings = self.get_controller().get(bgroup_id, request.args) - current_app.logger.info("controller worked") - current_app.logger.info(buildings) return self.json(buildings) @route('//', methods=['DELETE']) -- GitLab From d11a4a66caef96edbe1f89b43f6295204c7188dd Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Mon, 6 Apr 2020 12:09:20 -0700 Subject: [PATCH 03/27] Remove import from bgroup views. --- app/views/bgroup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/bgroup.py b/app/views/bgroup.py index 17f0a1c..7dea56a 100644 --- a/app/views/bgroup.py +++ b/app/views/bgroup.py @@ -1,5 +1,5 @@ """Building group view""" -from flask import request, current_app +from flask import request from flask.ext.classy import route from werkzeug.exceptions import MethodNotAllowed from ..views.base import RestView -- GitLab From 59375eca6a25628549e92104fb4c38e19ffb85d9 Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Mon, 6 Apr 2020 12:13:38 -0700 Subject: [PATCH 04/27] Add log statements to building views> --- app/views/building.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/building.py b/app/views/building.py index 7fcf5b3..7f711f7 100644 --- a/app/views/building.py +++ b/app/views/building.py @@ -1,5 +1,5 @@ """Views for working with buildings.""" -from flask import request +from flask import request, current_app from werkzeug.exceptions import MethodNotAllowed from .base import UnprotectedRestView from ..controllers.building import BuildingController @@ -26,7 +26,7 @@ class BuildingView(UnprotectedRestView): """/ GET - Retrieve a list of resources.""" # TODO: Add data key back to self.json # return super(BuildingView, self).index(request.args) - print("entering index") + current_app.logger.info('Index of buildings') return self.json( [self.parse(m) for m in self.get_controller().index(request.args)] ) @@ -37,6 +37,7 @@ class BuildingView(UnprotectedRestView): """/{id} GET - Retrieve a resource by id.""" # TODO: Add data key back in self.json # return super(BuildingView, self).get(id_, request.args) + current_app.logger.info('Get building by id') return self.json( self.parse( self.get_controller().get(id_, request.args) -- GitLab From cc4e394953aa6c9ba63a3b289d8107ea1fe262f9 Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Mon, 6 Apr 2020 12:34:13 -0700 Subject: [PATCH 05/27] Add logger to view. --- app/views/building.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/building.py b/app/views/building.py index 7f711f7..c675ac3 100644 --- a/app/views/building.py +++ b/app/views/building.py @@ -38,6 +38,8 @@ class BuildingView(UnprotectedRestView): # TODO: Add data key back in self.json # return super(BuildingView, self).get(id_, request.args) current_app.logger.info('Get building by id') + current_app.logger.info(id_) + current_app.logger.info(request.args) return self.json( self.parse( self.get_controller().get(id_, request.args) -- GitLab From 0db6e6e31c81d5b2e274bc340cef10b1b89b4f59 Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Mon, 6 Apr 2020 12:37:11 -0700 Subject: [PATCH 06/27] Remove logger from bgroup. --- app/controllers/bgroup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/bgroup.py b/app/controllers/bgroup.py index 7aadb68..762bab4 100644 --- a/app/controllers/bgroup.py +++ b/app/controllers/bgroup.py @@ -1,5 +1,5 @@ """Building groups controller""" -from flask import g, current_app +from flask import g from werkzeug.exceptions import BadRequest from .base import RestController from ..forms.bgroup import BGroupForm, BuildingBGroupForm @@ -32,7 +32,6 @@ class BGroupController(RestController): if 'limit' in filter_data: query += 'LIMIT {}'.format(int(filter_data['limit'])) - current_app.logger.info('execute query') results = self.db.session.execute(query) return [dict(row) for row in results] -- GitLab From fafdd1927b4c867c6c2db58cd03d17f67a238042 Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Mon, 6 Apr 2020 12:37:58 -0700 Subject: [PATCH 07/27] Add logger in controller. --- app/controllers/building.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/building.py b/app/controllers/building.py index 1d90d2b..a46f3a5 100644 --- a/app/controllers/building.py +++ b/app/controllers/building.py @@ -46,6 +46,7 @@ class BuildingController(RestController): Returns: dict: Building object """ + current_app.logger.info("In the building controller get function") try: building_list = proc(self.Model, self.Model.PROCS['READ_BUILDING'], **{'building_id': id_}) except Exception as err: -- GitLab From 9a4378cf0749efc898428a960353ed35a1ec49a5 Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Mon, 6 Apr 2020 13:00:53 -0700 Subject: [PATCH 08/27] Add log after stored proc finishes. --- app/controllers/building.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/building.py b/app/controllers/building.py index a46f3a5..b0b69a1 100644 --- a/app/controllers/building.py +++ b/app/controllers/building.py @@ -54,6 +54,7 @@ class BuildingController(RestController): BadRequest(str(err)) if current_app.config['DEBUG'] else BadRequest('Error while executing db call') ) + current_app.logger.info("Called stored procedure") address_list = [] for building in building_list: address_list.append(building.street_address) -- GitLab From d7a1336aa6bec40b6ab1d8776c567d3fa85aae46 Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Mon, 6 Apr 2020 13:21:40 -0700 Subject: [PATCH 09/27] Turn on debugger if in the development environment. --- wsgi.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wsgi.py b/wsgi.py index 069f235..cdc3231 100644 --- a/wsgi.py +++ b/wsgi.py @@ -9,6 +9,9 @@ env = os.environ['ENVIRONMENT'] # Correctly raise a file not found if the specified environment does not exist. app = create_app('config/{}.py'.format(env)) +if env = 'development': + app.debug = True + # with app.app_context(): # # Build the database models. # db.create_all() -- GitLab From 7a44e0487cbdd4a44219a70b056b5756a06c9b1f Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Mon, 6 Apr 2020 13:30:37 -0700 Subject: [PATCH 10/27] Fix syntax --- wsgi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wsgi.py b/wsgi.py index cdc3231..4e901de 100644 --- a/wsgi.py +++ b/wsgi.py @@ -9,7 +9,7 @@ env = os.environ['ENVIRONMENT'] # Correctly raise a file not found if the specified environment does not exist. app = create_app('config/{}.py'.format(env)) -if env = 'development': +if env == 'development': app.debug = True # with app.app_context(): -- GitLab From e9b1780e1568f25e9a999093f1c592c8e8b3495c Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Mon, 6 Apr 2020 13:39:53 -0700 Subject: [PATCH 11/27] Log error if it exists. --- app/controllers/building.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/building.py b/app/controllers/building.py index b0b69a1..c09a99f 100644 --- a/app/controllers/building.py +++ b/app/controllers/building.py @@ -50,6 +50,8 @@ class BuildingController(RestController): try: building_list = proc(self.Model, self.Model.PROCS['READ_BUILDING'], **{'building_id': id_}) except Exception as err: + current_app.logger.info("Failed!") + current_app.logger.info(str(err)) raise ( BadRequest(str(err)) if current_app.config['DEBUG'] else BadRequest('Error while executing db call') -- GitLab From 74d212713d3ee728ffac2e04e7696be7b2b68560 Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Mon, 6 Apr 2020 13:51:40 -0700 Subject: [PATCH 12/27] Trying here! --- app/controllers/building.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/building.py b/app/controllers/building.py index c09a99f..5de0c21 100644 --- a/app/controllers/building.py +++ b/app/controllers/building.py @@ -48,6 +48,7 @@ class BuildingController(RestController): """ current_app.logger.info("In the building controller get function") try: + current_app.logger.info("Trying!") building_list = proc(self.Model, self.Model.PROCS['READ_BUILDING'], **{'building_id': id_}) except Exception as err: current_app.logger.info("Failed!") -- GitLab From 5c6fcb2840866905ff6cf1f4b897c54f13f60dd0 Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Mon, 6 Apr 2020 14:05:00 -0700 Subject: [PATCH 13/27] Add logger to db. --- app/lib/database.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/lib/database.py b/app/lib/database.py index c1c8424..f2086aa 100644 --- a/app/lib/database.py +++ b/app/lib/database.py @@ -1,6 +1,7 @@ import sqlite3 from sqlalchemy import event from flask.ext.sqlalchemy import SQLAlchemy +from flask import current_app # A convenience instance for database objects. All access to database models @@ -67,7 +68,7 @@ def proc(model, method, limit=None, offset=None, **kwargs): Returns: list: Results of the query """ - + current_app.logger.info("In procedure function") params = "" cols = ','.join(str(i) for i in model.__table__.get_columns()) # By seperating the args like this sanatation will happen automatically @@ -93,6 +94,7 @@ def proc(model, method, limit=None, offset=None, **kwargs): query += ' offset {}'.format(offset) try: + current_app.logger.info("Calling stored procedure") results = db.session.execute(query, input_args) db.session.commit() -- GitLab From 04373fba8f35f1cbd026481cd2a9ef03d38228b1 Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Mon, 6 Apr 2020 14:14:26 -0700 Subject: [PATCH 14/27] Add more logging statements to stored procedure. --- app/lib/database.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/lib/database.py b/app/lib/database.py index f2086aa..88ee40b 100644 --- a/app/lib/database.py +++ b/app/lib/database.py @@ -97,12 +97,13 @@ def proc(model, method, limit=None, offset=None, **kwargs): current_app.logger.info("Calling stored procedure") results = db.session.execute(query, input_args) db.session.commit() - + current_app.logger.info("procedure commited") data = [] for row in results: data.append(model(**dict(zip(row.keys(), row)))) except Exception as err: + current_app.logger.info(err) raise err return data -- GitLab From f4055c08affbf38d0f4460ef70093edb5ae2be25 Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Mon, 6 Apr 2020 14:24:04 -0700 Subject: [PATCH 15/27] Add error call in debugger. --- app/lib/database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/database.py b/app/lib/database.py index 88ee40b..2a471e3 100644 --- a/app/lib/database.py +++ b/app/lib/database.py @@ -103,7 +103,7 @@ def proc(model, method, limit=None, offset=None, **kwargs): data.append(model(**dict(zip(row.keys(), row)))) except Exception as err: - current_app.logger.info(err) + current_app.logger.info("Error in db call") raise err return data -- GitLab From f30bc69dabc8ff9902af89b35752a3bc81be50ef Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Tue, 7 Apr 2020 11:58:55 -0700 Subject: [PATCH 16/27] Print out query and query args in logger. --- app/lib/database.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/lib/database.py b/app/lib/database.py index 2a471e3..b9d161f 100644 --- a/app/lib/database.py +++ b/app/lib/database.py @@ -95,6 +95,8 @@ def proc(model, method, limit=None, offset=None, **kwargs): try: current_app.logger.info("Calling stored procedure") + current_app.logger.info(query) + current_app.logger.info(input_args) results = db.session.execute(query, input_args) db.session.commit() current_app.logger.info("procedure commited") -- GitLab From 9074a1e82f373106c043b5206c5885f0865aa97c Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Tue, 7 Apr 2020 12:09:27 -0700 Subject: [PATCH 17/27] Show key if it does exist in logger. --- app/permissions/application.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/permissions/application.py b/app/permissions/application.py index 42cc990..dfec529 100644 --- a/app/permissions/application.py +++ b/app/permissions/application.py @@ -20,6 +20,7 @@ class AppNeed(Permission): if not key: current_app.logger.info('Session app key is empty') return False + current_app.logger.info('session key is {}'.format(key)) token = session.get('app_token') cache_key = services.config['app_key'] + '/' + key -- GitLab From f67c64b9bcdfd3442e6bf39b9d7b50f8d3a51bd0 Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Tue, 7 Apr 2020 12:10:11 -0700 Subject: [PATCH 18/27] remove log statements from authorization module and building view. --- app/permissions/authorization.py | 2 -- app/views/building.py | 3 --- 2 files changed, 5 deletions(-) diff --git a/app/permissions/authorization.py b/app/permissions/authorization.py index 5268e47..61d6148 100644 --- a/app/permissions/authorization.py +++ b/app/permissions/authorization.py @@ -29,7 +29,6 @@ def secured(f): params = {'expand': ''} response = services.user.get('/user/{}'.format(g.sub), headers=headers, params=params) - current_app.logger.info('Response status code {}'.format(response.status_code)) if not response.status_code == 200: raise Unauthorized @@ -45,6 +44,5 @@ def secured(f): else: raise Unauthorized - current_app.logger.info('Authorized request') return f(*args, **kwargs) return decorated_function diff --git a/app/views/building.py b/app/views/building.py index c675ac3..3d026f9 100644 --- a/app/views/building.py +++ b/app/views/building.py @@ -37,9 +37,6 @@ class BuildingView(UnprotectedRestView): """/{id} GET - Retrieve a resource by id.""" # TODO: Add data key back in self.json # return super(BuildingView, self).get(id_, request.args) - current_app.logger.info('Get building by id') - current_app.logger.info(id_) - current_app.logger.info(request.args) return self.json( self.parse( self.get_controller().get(id_, request.args) -- GitLab From db1850737c6681cae4a21d3d095b46063aa26be0 Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Wed, 8 Apr 2020 10:21:23 -0700 Subject: [PATCH 19/27] Remove log in index. --- app/views/building.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/building.py b/app/views/building.py index 3d026f9..0e9a168 100644 --- a/app/views/building.py +++ b/app/views/building.py @@ -26,7 +26,6 @@ class BuildingView(UnprotectedRestView): """/ GET - Retrieve a list of resources.""" # TODO: Add data key back to self.json # return super(BuildingView, self).index(request.args) - current_app.logger.info('Index of buildings') return self.json( [self.parse(m) for m in self.get_controller().index(request.args)] ) -- GitLab From 825b559bfd0b82611631c24459c1bcec84575de5 Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Wed, 8 Apr 2020 10:30:37 -0700 Subject: [PATCH 20/27] Check supervisor configuration. --- app/config/supervisor.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/supervisor.conf b/app/config/supervisor.conf index 477f24b..5679413 100644 --- a/app/config/supervisor.conf +++ b/app/config/supervisor.conf @@ -1,5 +1,5 @@ [program:uwsgi] -command = /usr/local/bin/uwsgi --ini $CODEROOT/uwsgi.ini -O 2 +command = /usr/local/bin/uwsgi --ini $CODEROOT/uwsgi.ini -O 1 [program:nginx] command = /usr/sbin/nginx -- GitLab From d8c041bbdc0082b4f2ff6ab1f7d1242158ea022c Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Wed, 8 Apr 2020 12:12:25 -0700 Subject: [PATCH 21/27] looking to fix the segmentation fault. --- wsgi.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/wsgi.py b/wsgi.py index 4e901de..069f235 100644 --- a/wsgi.py +++ b/wsgi.py @@ -9,9 +9,6 @@ env = os.environ['ENVIRONMENT'] # Correctly raise a file not found if the specified environment does not exist. app = create_app('config/{}.py'.format(env)) -if env == 'development': - app.debug = True - # with app.app_context(): # # Build the database models. # db.create_all() -- GitLab From 91feec3ea92aec706781c9c9e575381feda2a991 Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Wed, 8 Apr 2020 12:12:37 -0700 Subject: [PATCH 22/27] looking to fix the segmentation fault part 2. --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 6d4f8f3..81d1c40 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,10 +24,13 @@ RUN apt-get -qq update && apt-get install -y \ python3 \ python3-pip \ supervisor \ + libpq-dev \ && rm -rf /var/lib/apt/lists/* RUN pip3 install -q uwsgi +RUN pip3 install --no-binary :all: psycopg2==2.7.3.2 + COPY ./requirements.txt $CODEROOT/requirements.txt RUN sed -i "s@git+ssh:\/\/git@git+https:\/\/$GITHUB_OAUTH_TOKEN@" $CODEROOT/requirements.txt -- GitLab From 86caf68d008d04802b9c3b9d945614b4f8410e7a Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Wed, 8 Apr 2020 14:56:45 -0700 Subject: [PATCH 23/27] Revert to old uwsgi optimization. --- app/config/supervisor.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/supervisor.conf b/app/config/supervisor.conf index 5679413..477f24b 100644 --- a/app/config/supervisor.conf +++ b/app/config/supervisor.conf @@ -1,5 +1,5 @@ [program:uwsgi] -command = /usr/local/bin/uwsgi --ini $CODEROOT/uwsgi.ini -O 1 +command = /usr/local/bin/uwsgi --ini $CODEROOT/uwsgi.ini -O 2 [program:nginx] command = /usr/sbin/nginx -- GitLab From c6464dfe5f1a70c7b8456d289d7af4bd14f4d3ea Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Wed, 8 Apr 2020 14:59:35 -0700 Subject: [PATCH 24/27] Remove log events in building controller. --- app/controllers/building.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/controllers/building.py b/app/controllers/building.py index 5de0c21..1d90d2b 100644 --- a/app/controllers/building.py +++ b/app/controllers/building.py @@ -46,18 +46,13 @@ class BuildingController(RestController): Returns: dict: Building object """ - current_app.logger.info("In the building controller get function") try: - current_app.logger.info("Trying!") building_list = proc(self.Model, self.Model.PROCS['READ_BUILDING'], **{'building_id': id_}) except Exception as err: - current_app.logger.info("Failed!") - current_app.logger.info(str(err)) raise ( BadRequest(str(err)) if current_app.config['DEBUG'] else BadRequest('Error while executing db call') ) - current_app.logger.info("Called stored procedure") address_list = [] for building in building_list: address_list.append(building.street_address) -- GitLab From 3776ade6f63342a568827545c44271170f4d3dff Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Wed, 8 Apr 2020 15:01:26 -0700 Subject: [PATCH 25/27] Remove log events in database wrapper. --- app/lib/database.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/lib/database.py b/app/lib/database.py index b9d161f..f8f75b3 100644 --- a/app/lib/database.py +++ b/app/lib/database.py @@ -1,8 +1,6 @@ import sqlite3 from sqlalchemy import event from flask.ext.sqlalchemy import SQLAlchemy -from flask import current_app - # A convenience instance for database objects. All access to database models # and operations should be through this object. @@ -68,7 +66,6 @@ def proc(model, method, limit=None, offset=None, **kwargs): Returns: list: Results of the query """ - current_app.logger.info("In procedure function") params = "" cols = ','.join(str(i) for i in model.__table__.get_columns()) # By seperating the args like this sanatation will happen automatically @@ -94,18 +91,13 @@ def proc(model, method, limit=None, offset=None, **kwargs): query += ' offset {}'.format(offset) try: - current_app.logger.info("Calling stored procedure") - current_app.logger.info(query) - current_app.logger.info(input_args) results = db.session.execute(query, input_args) db.session.commit() - current_app.logger.info("procedure commited") data = [] for row in results: data.append(model(**dict(zip(row.keys(), row)))) except Exception as err: - current_app.logger.info("Error in db call") raise err return data -- GitLab From f5c8bd1c7101af3eb5ef3732297e049bfc9dbf6e Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Wed, 8 Apr 2020 15:04:05 -0700 Subject: [PATCH 26/27] Remove other logging events. --- app/permissions/application.py | 2 -- app/views/building.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/permissions/application.py b/app/permissions/application.py index dfec529..07ccbc9 100644 --- a/app/permissions/application.py +++ b/app/permissions/application.py @@ -18,9 +18,7 @@ class AppNeed(Permission): # Check for a key. key = session.get('app_key') if not key: - current_app.logger.info('Session app key is empty') return False - current_app.logger.info('session key is {}'.format(key)) token = session.get('app_token') cache_key = services.config['app_key'] + '/' + key diff --git a/app/views/building.py b/app/views/building.py index 0e9a168..dbd499c 100644 --- a/app/views/building.py +++ b/app/views/building.py @@ -1,5 +1,5 @@ """Views for working with buildings.""" -from flask import request, current_app +from flask import request from werkzeug.exceptions import MethodNotAllowed from .base import UnprotectedRestView from ..controllers.building import BuildingController -- GitLab From 9166b150340f342c539b5ec318224756967193d4 Mon Sep 17 00:00:00 2001 From: Jose Contreras Date: Wed, 8 Apr 2020 15:05:38 -0700 Subject: [PATCH 27/27] Remove irrelevant comment. --- app/controllers/bgroup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/bgroup.py b/app/controllers/bgroup.py index 762bab4..249d41a 100644 --- a/app/controllers/bgroup.py +++ b/app/controllers/bgroup.py @@ -18,7 +18,6 @@ class BGroupController(RestController): def index(self, filter_data): """Get a query for all models matching filter_data.""" - # Adding Logs to test deployment if 'read_all::BGroup' in g.user_permissions: return super().index(filter_data) user_groups = g.get('user_groups', None) -- GitLab