Merge branch 'develop' of github.com:garnaat/kappa

@@ -11,6 +11,7 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 # language governing permissions and limitations under the License.
+from datetime import datetime
 import logging
 import logging
 
 
 import click
 import click
@@ -56,7 +57,9 @@ def test(ctx):
 def tail(ctx):
 def tail(ctx):
     context = Context(ctx.obj['config'], ctx.obj['debug'])
     context = Context(ctx.obj['config'], ctx.obj['debug'])
     click.echo('tailing logs...')
     click.echo('tailing logs...')
-    context.tail()
+    for e in context.tail()[-10:]:
+        ts = datetime.utcfromtimestamp(e['timestamp']//1000).isoformat()
+        click.echo("{}: {}".format(ts, e['message']))
     click.echo('...done')
     click.echo('...done')
 
 
 @cli.command()
 @cli.command()

@@ -22,7 +22,7 @@ LOG = logging.getLogger(__name__)
 class Stack(object):
 class Stack(object):
 
 
     completed_states = ('CREATE_COMPLETE', 'UPDATE_COMPLETE')
     completed_states = ('CREATE_COMPLETE', 'UPDATE_COMPLETE')
-    failed_states = ('ROLLBACK_COMPLETE',)
+    failed_states = ('UPDATE_ROLLBACK_COMPLETE', 'ROLLBACK_COMPLETE')
 
 
     def __init__(self, context, config):
     def __init__(self, context, config):
         self._context = context
         self._context = context