Merge pull request prometheus#55 from kvikas/master

brian-brazil · brian-brazil · commit 1b88cd0ea119 · 2015-10-03T06:34:30.000+01:00
Closing open socket in instance_ip_grouping_key()
diff --git a/prometheus_client/exposition.py b/prometheus_client/exposition.py
@@ -6,6 +6,7 @@
 import socket
 import time
 import threading
+from contextlib import closing
 
 from . import core
 try:
@@ -125,6 +126,6 @@ def _use_gateway(method, gateway, job, registry, grouping_key, timeout):
 
 def instance_ip_grouping_key():
     '''Grouping key with instance set to the IP Address of this host.'''
-    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    s.connect(('localhost', 0))
-    return {'instance': s.getsockname()[0]}
+    with closing(socket.socket(socket.AF_INET, socket.SOCK_DGRAM)) as s:
+        s.connect(('localhost', 0))
+        return {'instance': s.getsockname()[0]}
