Merge branch 'staging'

Author: tifayuki

dockercloud/__init__.py

@@ -25,7 +25,7 @@
 from dockercloud.api.events import Events
 from dockercloud.api.nodeaz import AZ
 
-__version__ = '1.0.1'
+__version__ = '1.0.2'
 
 dockercloud_auth = os.environ.get('DOCKERCLOUD_AUTH')
 basic_auth = auth.load_from_file("~/.docker/config.json")

dockercloud/api/events.py

@@ -28,7 +28,7 @@ def _on_message(self, ws, message):
             return
 
         if self.message_handler:
-            self.message_handler(event)
+            self.message_handler(message)
 
     def run_forever(self, *args, **kwargs):
         while True:

dockercloud/api/http.py

@@ -11,6 +11,26 @@
 
 logger = logging.getLogger("python-dockercloud")
 
+global_session = Session()
+
+
+def get_session():
+    return global_session
+
+
+def close_session():
+    try:
+        global global_session
+        global_session.close()
+    except:
+        pass
+
+
+def new_session():
+    close_session()
+    global global_session
+    global_session = Session()
+
 
 def send_request(method, path, inject_header=True, **kwargs):
     json = None
@@ -24,17 +44,16 @@ def send_request(method, path, inject_header=True, **kwargs):
     # construct headers
     headers = {'Content-Type': 'application/json', 'User-Agent': user_agent}
     headers.update(dockercloud.auth.get_auth_header())
-    logger.info("Request: %s, %s, %s, %s" % (method, url, headers, kwargs))
 
     # construct request
-    s = Session()
+    s = get_session()
     req = Request(method, url, headers=headers, **kwargs)
-
     # get environment proxies
     env_proxies = utils.get_environ_proxies(url) or {}
     kw_args = {'proxies': env_proxies}
 
     # make the request
+    logger.info("Request: %s, %s, %s, %s, %s" % (method, url, headers, s.cookies, kwargs))
     response = s.send(req.prepare(), **kw_args)
     status_code = getattr(response, 'status_code', None)
     logger.info("Response: Status %s, %s, %s" % (str(status_code), response.headers, response.text))