[telepathy-ashes/master] Add butterfly subprocess, and fix exponential backoff.

[David Laban]

---
 ashes/tools/echo_daemon.py |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/ashes/tools/echo_daemon.py b/ashes/tools/echo_daemon.py
index 4877e9f..63fb47d 100644
--- a/ashes/tools/echo_daemon.py
+++ b/ashes/tools/echo_daemon.py
@@ -36,6 +36,7 @@ import copy
 import time
 import grp
 import signal
+import random
 import daemon
 import subprocess
 from subprocess import Popen, PIPE, STDOUT, CalledProcessError
@@ -97,7 +98,11 @@ def initial_program_setup(account_file):
     gabble = Popen(['/usr/lib/telepathy/telepathy-gabble',
                       'echo_daemon', DATE],
                    env=os.environ)
+    butterfly = Popen(['/home/alsuren/src/telepathy-butterfly/telepathy-butterfly',
+                      'echo_daemon', DATE],
+                   env=os.environ)
 
+    subprocesses['butterfly'] = butterfly
     subprocesses['gabble'] = gabble
 
 def kill_everything():
-- 
1.5.6.5