[ARVADOS] updated: 984652e494eacaf8aba2badcbce0b6b79bebf4a3

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/__init__.py | 1 +
 sdk/python/arvados/events.py    | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

       via  984652e494eacaf8aba2badcbce0b6b79bebf4a3 (commit)
       via  65740fba9a4e44687c47b49311b6c9cc32326eeb (commit)
      from  d6c21313094521040c9b013172c5ebe136341c03 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 984652e494eacaf8aba2badcbce0b6b79bebf4a3
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Feb 17 12:59:57 2016 -0500

    8319: Add log message about uploading docker image

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index 3baa9a6..8370e3d 100644
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -38,6 +38,7 @@ def arv_docker_get_image(api_client, dockerRequirement, pull_image):
         args = [image_name]
         if image_tag:
             args.append(image_tag)
+        logger.info("Uploading Docker image %s", ":".join(args))
         arvados.commands.keepdocker.main(args)
 
     return dockerRequirement["dockerImageId"]

commit 65740fba9a4e44687c47b49311b6c9cc32326eeb
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Feb 17 09:21:09 2016 -0500

    8319: Add environment variable to disable websockets.

diff --git a/sdk/python/arvados/events.py b/sdk/python/arvados/events.py
index 3132da3..da7ef7e 100644
--- a/sdk/python/arvados/events.py
+++ b/sdk/python/arvados/events.py
@@ -163,7 +163,10 @@ def subscribe(api, filters, on_event, poll_fallback=15, last_log_id=None):
         return _subscribe_websocket(api, filters, on_event, last_log_id)
 
     try:
-        return _subscribe_websocket(api, filters, on_event, last_log_id)
+        if not config.flag_is_true('ARVADOS_DISABLE_WEBSOCKETS'):
+            return _subscribe_websocket(api, filters, on_event, last_log_id)
+        else:
+            _logger.info("Using polling because ARVADOS_DISABLE_WEBSOCKETS is true")
     except Exception as e:
         _logger.warn("Falling back to polling after websocket error: %s" % e)
     p = PollClient(api, filters, on_event, poll_fallback, last_log_id)

-----------------------------------------------------------------------


hooks/post-receive
--