Revise default startup string watched for in cluster.start for 2.2+

riptano · May 19, 2015 · 177a141 · 177a141
1 parent 41b13f9
commit 177a141
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/ccmlib/cluster.py b/ccmlib/cluster.py
@@ -254,7 +254,8 @@ def start(self, no_wait=False, verbose=False, wait_for_binary_proto=False, wait_
         else:
             for node, p, mark in started:
                 try:
-                    node.watch_log_for("Listening for thrift clients...", process=p, verbose=verbose, from_mark=mark)
+                    start_message = "Listening for thrift clients..." if self.cassandra_version() < "2.2" else "Starting listening for CQL clients"
+                    node.watch_log_for(start_message, timeout=60, process=p, verbose=verbose, from_mark=mark)
                 except RuntimeError:
                     return None