renaming for clarity

4 files changed, 2 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 606b55a..b570079 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Actual soledad sync
 
 soledad-sync-server:
-	./server-solsync.py
+	./server_with_soledad_syncer.py
 
 measure-ping:
 	httperf --server localhost --port 8080 --num-calls 5 --num-conns 20 --uri /ping
diff --git a/get-client-cpu-mem.py b/get_client_cpu_mem.py
index ba5049a..ba5049a 100644
--- a/get-client-cpu-mem.py
+++ b/get_client_cpu_mem.py
diff --git a/measure-perf-series.py b/measure-perf-series.py
index 24e9d5f..6cfcb02 100644
--- a/measure-perf-series.py
+++ b/measure-perf-series.py
@@ -11,14 +11,9 @@ start = datetime.datetime.now()
 for i in range(POINTS):
     value = commands.getoutput('python get_ping_rate.py')
     print "Step", i, "...", value
-    # TODO --- cpu/mem too brittle.
-    cpu_mem = commands.getoutput('python get-client-cpu-mem.py')
+    cpu_mem = commands.getoutput('python get_client_cpu_mem.py')
     cpu, mem = cpu_mem.split()
-    print "CPU/MEM", cpu, mem
     now = datetime.datetime.now()
     secs = (now - start).total_seconds()
-    #print "TOOK", secs, "seconds"
     commands.getoutput(
-        #'echo %s\t%s >> series.log' % (secs, value))
         'echo %s\t%s\t%s\t%s >> series.log' % (secs, value, cpu, mem))
-    #, cpu, mem))
diff --git a/server-solsync.py b/server_with_soledad_syncer.py
index 71aae56..71aae56 100755
--- a/server-solsync.py
+++ b/server_with_soledad_syncer.py