aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kevi...@apache.org
Subject [1/9] git commit: Fix the twitter.thermos sdist to properly depend upon twitter.thermos.monitoring.
Date Thu, 05 Dec 2013 19:58:13 GMT
Updated Branches:
  refs/heads/master c72c92cf3 -> d51fecab9


Fix the twitter.thermos sdist to properly depend upon twitter.thermos.monitoring.


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/13ddf83c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/13ddf83c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/13ddf83c

Branch: refs/heads/master
Commit: 13ddf83c8072b3f7d4126a28e3731b27e501721f
Parents: c72c92c
Author: Brian Wickman <wickman@twitter.com>
Authored: Tue Dec 3 15:44:05 2013 -0800
Committer: Brian Wickman <wickman@twitter.com>
Committed: Tue Dec 3 15:44:05 2013 -0800

----------------------------------------------------------------------
 src/main/python/twitter/thermos/BUILD          |  1 +
 src/main/python/twitter/thermos/bin/thermos.py | 19 ++++++++-----------
 2 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/13ddf83c/src/main/python/twitter/thermos/BUILD
----------------------------------------------------------------------
diff --git a/src/main/python/twitter/thermos/BUILD b/src/main/python/twitter/thermos/BUILD
index 8235d01..7c5d760 100644
--- a/src/main/python/twitter/thermos/BUILD
+++ b/src/main/python/twitter/thermos/BUILD
@@ -4,6 +4,7 @@ python_library(
   name = 'thermos',
   dependencies = [
     pants('src/main/python/twitter/thermos/core'),
+    pants('src/main/python/twitter/thermos/monitoring'),
   ],
   provides = setup_py(
     name = 'twitter.thermos',

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/13ddf83c/src/main/python/twitter/thermos/bin/thermos.py
----------------------------------------------------------------------
diff --git a/src/main/python/twitter/thermos/bin/thermos.py b/src/main/python/twitter/thermos/bin/thermos.py
index 75e54d7..39ab1f2 100644
--- a/src/main/python/twitter/thermos/bin/thermos.py
+++ b/src/main/python/twitter/thermos/bin/thermos.py
@@ -467,16 +467,6 @@ def gc(args, options):
     print('Cancelling gc.')
 
 
-# TODO(wickman)  Implement.
-@app.command
-def monitor(args, options):
-  """Monitor task(s)
-
-    Usage: thermos monitor task_id [task_id_2 ...]
-  """
-  pass
-
-
 @app.command
 @app.command_option("--verbosity", default=0, dest='verbose', type='int',
                     help="Display more verbosity")
@@ -637,6 +627,8 @@ def help(args, options):
   print('unknown command: %s' % args[0], file=sys.stderr)
 
 
+
+
 def generate_usage():
   usage = """
 thermos
@@ -652,4 +644,9 @@ commands:
 LogOptions.set_disk_log_level('NONE')
 LogOptions.set_stdout_log_level('INFO')
 generate_usage()
-app.main()
+
+
+proxy_main = app.main
+
+
+proxy_main()


Mime
View raw message