From 8d649a885dbdc1a1bffbd11589a762da2c14f67f Mon Sep 17 00:00:00 2001 From: Taddes Date: Thu, 19 Sep 2024 17:24:31 -0400 Subject: [PATCH] rebase --- tools/tokenserver/util.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tools/tokenserver/util.py b/tools/tokenserver/util.py index 5d80068710..1c70c073cc 100644 --- a/tools/tokenserver/util.py +++ b/tools/tokenserver/util.py @@ -103,15 +103,10 @@ def __init__(self, opts, namespace=""): options = dict( namespace=namespace, statsd_namespace=namespace, -<<<<<<< HEAD statsd_host=getattr( opts, "metric_host", os.environ.get("SYNC_STATSD_HOST")), statsd_port=getattr( opts, "metric_port", os.environ.get("SYNC_STATSD_PORT")), -======= - statsd_host=getattr(opts, "metric_host", os.environ.get("METRIC_HOST")), - statsd_port=getattr(opts, "metric_port", os.environ.get("METRIC_PORT")), ->>>>>>> 3f79e5f (reformat tokenserver tools files) ) self.prefix = options.get("namespace") initialize(**options)