Second warning is covered anyway

DataDog · Oct 28, 2019 · ded4cee · ded4cee
1 parent ec6504f
commit ded4cee
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/datadog/util/hostname.py b/datadog/util/hostname.py
@@ -51,17 +51,17 @@ def get_hostname(hostname_from_config):
     config = None
 
     # first, try the config if hostname_from_config is set to True
-    if hostname_from_config:
-        try:
+    try:
+        if hostname_from_config:
             config = get_config()
             config_hostname = config.get('hostname')
             if config_hostname and is_valid_hostname(config_hostname):
                 log.warning("Hostname lookup from agent configuration will be deprecated "
                             "in an upcoming version of datadogpy. Set hostname_from_config to False "
                             "to get rid of this warning")
                 return config_hostname
-        except CfgNotFound:
-            log.warning("No agent or invalid configuration file found")
+    except CfgNotFound:
+        log.warning("No agent or invalid configuration file found")
 
     # Try to get GCE instance name
     if hostname is None: