Skip to content

Commit

Permalink
Resolved merge conflict by [keeping/deleting] etcd_migration.py
Browse files Browse the repository at this point in the history
  • Loading branch information
sametd committed Jan 9, 2024
2 parents e0eacd2 + fe4e7bd commit 575e507
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion aviso-server/auth/aviso_auth/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import logging

# version number for the application.
__version__ = "0.3.1"
__version__ = "0.3.2"

# setting application logger
logger = logging.getLogger("aviso-auth")
Expand Down
2 changes: 1 addition & 1 deletion aviso-server/auth/aviso_auth/frontend.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def index():

@handler.route(self.config.backend["route"], methods=["POST"])
def root():
logger.info(f"New request received from {request.remote_addr}, content: {request.data}")
logger.info(f"New request received from {request.headers.get('X-Forwarded-For')}, content: {request.data}")

resp_content = timed_process_request()

Expand Down

0 comments on commit 575e507

Please sign in to comment.