Skip to content

Commit

Permalink
Merge pull request #2 from AutomatedProcessImprovement/confidential-logs
Browse files Browse the repository at this point in the history
Only show the logs a user has uploaded
  • Loading branch information
LanaBot committed Jan 31, 2024
2 parents 7075461 + 458e207 commit bdc40c3
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ COPY --from=builder /opt/venv /opt/venv
WORKDIR /app
COPY ./kairos ./kairos
COPY ./app.py .
COPY ./config.py .

EXPOSE 5000
CMD ["gunicorn", "--workers=3", "--threads=3", "-b", ":5000", "app:app", "--timeout 1000"]
5 changes: 2 additions & 3 deletions kairos/models/event_logs_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@
def get_event_logs():
return list(db.files.find({}))

def get_event_logs_by_ids(logIds):
return list(db.files.find({"_id": {"$in": logIds}}))

def get_event_log(event_log_id):
log = db.files.find_one({"_id": int(event_log_id)})
if log == None:
raise Exception(f'No log found with ID {event_log_id}')
return log


def get_event_log_by_project_id(project_id):
log = db.files.find_one({"project_id": project_id})
if not log:
Expand Down
12 changes: 11 additions & 1 deletion kairos/services/event_logs_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,18 @@
import kairos.services.utils as k_utils

def get_logs():
logIds = request.args.getlist('logIds[]')
try:
logIds = [int(logId) for logId in logIds]
except Exception as e:
current_app.logger.error(f'{request.method} {request.path} 400 - Event log IDs should be integers.')
return jsonify(error="Event log IDs should be integers."),400

try:
logs = event_logs_db.get_event_logs()
if logIds:
logs = event_logs_db.get_event_logs_by_ids(logIds)
else:
logs = []
except Exception as e:
current_app.logger.error(f'{request.method} {request.path} 500 - {e}')
return jsonify(error=str(e)),500
Expand Down

0 comments on commit bdc40c3

Please sign in to comment.