[ARVADOS] updated: a779382603d2da2ec38ceb8a21262cc4f151f077

[Git user]

Summary of changes:
 services/nodemanager/arvnodeman/status.py | 2 ++
 services/nodemanager/tests/test_status.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

       via  a779382603d2da2ec38ceb8a21262cc4f151f077 (commit)
       via  26eb8f4cba5dd20ae49bf509a9a772ee4fe8b396 (commit)
      from  e7876a3ac520b128be7836e30172079ab2af5e45 (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 a779382603d2da2ec38ceb8a21262cc4f151f077
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Apr 11 11:17:05 2017 -0400

    11349: Move assertion outside loop for clarity.

diff --git a/services/nodemanager/tests/test_status.py b/services/nodemanager/tests/test_status.py
index df7b2ba..c11fe40 100644
--- a/services/nodemanager/tests/test_status.py
+++ b/services/nodemanager/tests/test_status.py
@@ -40,8 +40,8 @@ class StatusServerUpdates(unittest.TestCase):
                 self.assertEqual(200, r.status_code)
                 self.assertEqual('application/json', r.headers['content-type'])
                 resp = r.json()
-                self.assertEqual(1, resp['nodes_1'])
                 self.assertEqual(n, resp['nodes_'+str(n)])
+            self.assertEqual(1, resp['nodes_1'])
 
 
 class StatusServerDisabled(unittest.TestCase):

commit 26eb8f4cba5dd20ae49bf509a9a772ee4fe8b396
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Apr 11 11:16:50 2017 -0400

    11349: Warn if management/status server is not enabled.

diff --git a/services/nodemanager/arvnodeman/status.py b/services/nodemanager/arvnodeman/status.py
index cda91bb..d21899c 100644
--- a/services/nodemanager/arvnodeman/status.py
+++ b/services/nodemanager/arvnodeman/status.py
@@ -15,6 +15,8 @@ class Server(socketserver.ThreadingMixIn, http.server.HTTPServer, object):
         port = config.getint('Manage', 'port')
         self.enabled = port >= 0
         if not self.enabled:
+            _logger.warning("Management server disabled. "+
+                            "Use [Manage] config section to enable.")
             return
         self._config = config
         self._tracker = tracker

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


hooks/post-receive
--