From d3604a9a53a04af8c34d08f17b4708c460f76be9 Mon Sep 17 00:00:00 2001 From: "Kali Kaneko (leap communications)" Date: Fri, 8 Apr 2016 16:52:04 -0400 Subject: compare vshyba/develop: no gain for big downloads!!?? --- Makefile | 5 +- series-develop-mostly-downloading.log | 200 +++++++++++++++++ series-ping.py | 9 +- series-vshyba-mostly-downloading.log | 200 +++++++++++++++++ series-vshyba-pr-downloading.png | Bin 0 -> 48701 bytes series.log | 400 +++++++++++++++++----------------- server-solsync.py | 11 +- soledad_sync.py | 12 +- 8 files changed, 624 insertions(+), 213 deletions(-) create mode 100644 series-develop-mostly-downloading.log create mode 100644 series-vshyba-mostly-downloading.log create mode 100644 series-vshyba-pr-downloading.png diff --git a/Makefile b/Makefile index 188cc34..59bac0e 100644 --- a/Makefile +++ b/Makefile @@ -27,12 +27,15 @@ measure-ping: httperf --server localhost --port 8080 --num-calls 5 --num-conns 20 --uri /ping trigger-sync: - curl localhost:8080/start-sync + time curl localhost:8080/start-sync measure-series: + # TODO make sure we have restarted the server, send SIGNUP ? # TODO rm series.log, name it with a timestamp # TODO measure, first of all, the number of seconds from the beginning!!! (right now it's biased) # TODO add cpu/ram usage (ping command COULD RETURN THAT!) + rm -f /tmp/soledadsync/* + rm -f series.log python series-ping.py graph-series: diff --git a/series-develop-mostly-downloading.log b/series-develop-mostly-downloading.log new file mode 100644 index 0000000..786fedc --- /dev/null +++ b/series-develop-mostly-downloading.log @@ -0,0 +1,200 @@ +0.146611 92.0 +0.270829 116.7 +0.373923 162.5 +0.481579 151.8 +0.628966 97.4 +0.729113 164.6 +0.828087 166.3 +0.932109 155.1 +1.033571 160.5 +1.127917 192.5 +1.255497 114.3 +1.377279 120.9 +1.475758 165.2 +1.600711 139.0 +1.689222 198.9 +1.790007 162.4 +1.88861 164.3 +1.988284 164.6 +2.087045 163.4 +2.187243 167.9 +2.30939 120.2 +2.409135 160.7 +2.52891 157.6 +2.624653 176.8 +2.733529 151.7 +2.831848 164.7 +2.931747 167.6 +3.035841 156.4 +3.134986 163.6 +3.225994 197.8 +3.323722 164.7 +3.472147 128.8 +3.583002 165.2 +3.682639 157.9 +3.781186 163.3 +3.87943 166.2 +3.979335 161.3 +4.078777 165.6 +4.179432 158.8 +4.271461 192.6 +4.411085 129.8 +4.726378 36.3 +5.088731 31.6 +5.282361 66.8 +5.42562 107.0 +5.587686 91.5 +6.018959 28.3 +6.119126 178.6 +6.221279 168.2 +6.381905 84.3 +6.477005 172.5 +6.564761 202.8 +6.650418 207.9 +6.739078 206.8 +6.826413 205.7 +6.915889 191.4 +7.013164 173.1 +7.112519 161.3 +7.204698 183.0 +7.361362 95.9 +7.684715 36.1 +7.770815 204.1 +7.873552 154.8 +7.966415 193.8 +8.071128 165.8 +8.165377 176.7 +8.252686 202.4 +8.341501 195.4 +8.503823 81.3 +8.675987 98.5 +8.784715 163.3 +8.912934 136.9 +9.153374 55.2 +9.424194 54.6 +9.609199 70.6 +9.844506 53.2 +10.949191 9.5 +11.070788 135.6 +11.217772 98.2 +11.32907 170.2 +14.527689 3.2 +16.281738 6.1 +17.467019 9.0 +17.855672 29.3 +22.070654 2.4 +26.598696 2.2 +32.504955 1.7 +33.267419 15.2 +33.784956 23.0 +34.180041 28.6 +35.686187 7.1 +35.862436 83.8 +41.446228 1.8 +41.86474 30.4 +42.288466 28.0 +46.265131 2.6 +48.193722 5.4 +52.825402 2.2 +55.127358 4.4 +55.936392 14.2 +56.36726 30.7 +60.913661 2.3 +61.977608 10.3 +62.871997 12.1 +64.527267 6.2 +67.643071 3.3 +71.822888 2.5 +71.962923 104.5 +72.155263 70.5 +72.463457 37.1 +72.643338 71.2 +72.858899 58.4 +72.977696 133.7 +73.156055 82.7 +73.370837 56.8 +73.654923 41.0 +73.804983 94.8 +73.973569 76.4 +74.110361 112.8 +74.347357 53.0 +74.533721 68.2 +74.63501 164.2 +74.834398 75.1 +75.010702 73.1 +75.124536 137.9 +75.293742 91.8 +75.449806 92.2 +75.594877 98.1 +75.842575 49.0 +76.039913 62.7 +76.200103 83.5 +76.3361 110.7 +76.524775 69.4 +76.751112 57.5 +76.975107 54.3 +77.140096 78.3 +77.347596 60.8 +77.477185 112.0 +77.692261 56.5 +77.83545 98.2 +78.002956 81.6 +78.164592 83.7 +78.284227 127.2 +78.462994 76.6 +78.692386 62.8 +78.877368 79.2 +78.989764 142.2 +79.841573 12.4 +79.96535 124.3 +80.134219 81.6 +80.354758 58.2 +80.521174 97.6 +80.662098 108.0 +80.85532 64.5 +81.010912 87.5 +81.208943 66.9 +81.399531 70.9 +81.593366 66.2 +81.811071 56.1 +81.925028 136.0 +82.082549 91.5 +82.271776 73.4 +82.39467 143.1 +82.61233 60.4 +82.744271 106.2 +82.891476 93.9 +83.715519 12.8 +83.876689 83.4 +84.017277 107.9 +84.161174 98.3 +84.325526 80.9 +84.478622 88.4 +84.665816 68.0 +85.106429 25.1 +85.253272 97.3 +85.437544 82.4 +85.584829 92.7 +85.76532 71.0 +85.918936 87.6 +88.689109 3.7 +88.775545 201.8 +88.865773 199.3 +88.968487 153.6 +89.056057 195.8 +89.147794 182.2 +89.577983 25.5 +89.665385 198.3 +89.767074 163.5 +89.890315 118.7 +89.978871 191.8 +90.131569 88.9 +90.275651 97.7 +90.493247 61.5 +90.702512 60.7 +90.870657 79.2 +91.027743 90.4 +91.196294 86.9 +91.397952 63.8 +91.551759 89.4 +91.741478 66.9 diff --git a/series-ping.py b/series-ping.py index c4fc508..dd6277d 100644 --- a/series-ping.py +++ b/series-ping.py @@ -11,11 +11,14 @@ start = datetime.datetime.now() for i in range(POINTS): value = commands.getoutput('python get_ping_rate.py') print "Step", i, "...", value - cpu_mem = commands.getoutput('python get-client-cpu-mem.py') - cpu, mem = cpu_mem.split() + # TODO --- cpu/mem too brittle. + #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\t%s\t%s >> series.log' % (secs, value, cpu, mem)) + 'echo %s\t%s >> series.log' % (secs, value)) + #'echo %s\t%s\t%s\t%s >> series.log' % (secs, value)) + #, cpu, mem)) diff --git a/series-vshyba-mostly-downloading.log b/series-vshyba-mostly-downloading.log new file mode 100644 index 0000000..31e4fdb --- /dev/null +++ b/series-vshyba-mostly-downloading.log @@ -0,0 +1,200 @@ +0.228036 80.1 ID list +0.427603 136.4 ID list +0.606968 134.2 ID list +0.776848 164.2 ID list +0.9528 158.7 ID list +1.138303 162.1 ID list +1.319314 136.1 ID list +1.478195 176.3 ID list +1.659156 147.4 ID list +1.820303 184.9 ID list +2.033041 94.1 ID list +2.204217 156.6 ID list +2.364273 187.8 ID list +2.563682 148.1 ID list +2.731267 160.7 ID list +2.920588 165.5 ID list +3.102023 150.5 ID list +3.262814 192.2 ID list +3.434788 150.3 ID list +3.601548 159.5 ID list +3.776004 142.2 ID list +4.014328 99.8 ID list +4.644771 19.5 ID list +4.924021 61.1 ID list +5.13805 105.9 ID list +5.391785 71.4 ID list +5.808837 38.1 ID list +5.993077 161.2 ID list +6.159887 184.4 ID list +6.323694 184.6 ID list +6.483707 192.1 ID list +6.6841 193.7 ID list +6.982552 74.1 ID list +7.195921 154.0 ID list +7.999023 14.8 ID list +8.182374 144.3 ID list +8.391058 136.3 ID list +8.700405 62.6 ID list +9.090672 52.4 ID list +9.315134 112.1 ID list +11.042485 6.6 ID list +14.410406 3.1 ID list +15.043565 24.6 ID list +21.608086 1.6 ID list +28.324848 1.5 ID list +29.152426 15.5 ID list +29.671079 27.1 ID list +30.973446 8.9 ID list +31.907162 15.1 ID list +34.089658 5.7 ID list +42.615892 1.2 ID list +43.20753 26.9 ID list +43.569853 56.3 ID list +48.0734 2.3 ID list +55.313666 1.4 ID list +64.314371 1.1 ID list +74.731973 1.0 ID list +75.582732 14.3 ID list +75.976536 39.3 ID list +76.289558 51.6 ID list +76.648606 51.8 ID list +76.913921 83.2 ID list +77.17764 78.9 ID list +77.44485 86.4 ID list +77.723256 76.2 ID list +77.995627 104.0 ID list +78.280363 65.3 ID list +78.588884 66.0 ID list +78.88905 67.8 ID list +79.162817 84.0 ID list +79.409463 94.4 ID list +79.705285 98.0 ID list +79.97548 96.6 ID list +80.25932 66.5 ID list +80.629667 38.3 ID list +80.885407 77.5 ID list +81.138183 75.0 ID list +81.384211 78.1 ID list +81.640244 77.7 ID list +81.887105 84.8 ID list +82.146077 78.7 ID list +82.46811 57.7 ID list +82.734878 73.3 ID list +82.964125 98.3 ID list +83.242784 62.7 ID list +83.491797 80.8 ID list +83.775729 67.6 ID list +84.058527 90.6 ID list +84.279574 100.4 ID list +84.517498 81.1 ID list +84.777364 72.8 ID list +85.557466 15.2 ID list +85.815106 73.3 ID list +86.113537 61.8 ID list +86.328871 106.9 ID list +86.572852 80.0 ID list +86.825051 85.6 ID list +87.157973 65.6 ID list +87.411139 76.1 ID list +87.63215 96.6 ID list +88.085785 38.1 ID list +88.3385 74.8 ID list +88.556542 99.2 ID list +88.815835 81.8 ID list +89.090422 71.6 ID list +89.34083 83.5 ID list +89.589276 78.9 ID list +89.900271 54.5 ID list +90.17703 81.6 ID list +90.44772 75.1 ID list +90.6924 78.2 ID list +91.005551 77.2 ID list +91.302581 52.8 ID list +91.467459 165.1 ID list +91.638065 176.3 ID list +91.965867 69.1 ID list +92.156766 135.5 ID list +92.31948 171.6 ID list +92.535805 90.2 ID list +92.760084 83.4 ID list +93.022507 76.3 ID list +93.289382 69.8 ID list +93.554319 77.4 ID list +93.816978 110.0 ID list +94.080687 78.7 ID list +94.33067 81.2 ID list +94.666009 60.0 ID list +94.920869 80.3 ID list +95.154128 82.7 ID list +95.439828 83.3 ID list +95.688296 95.0 ID list +95.912762 90.5 ID list +96.142525 93.1 ID list +96.380747 80.5 ID list +96.666862 82.7 ID list +96.944707 78.4 ID list +97.167525 89.5 ID list +97.456508 83.7 ID list +97.722512 72.9 ID list +97.945854 93.1 ID list +98.176423 84.9 ID list +98.436432 80.9 ID list +98.706883 64.4 ID list +98.944748 83.5 ID list +99.209068 66.7 ID list +99.422483 101.6 ID list +99.674697 86.2 ID list +99.950896 65.0 ID list +100.214678 78.0 ID list +100.444756 86.4 ID list +100.728892 66.1 ID list +101.001872 86.0 ID list +101.238301 83.2 ID list +101.518888 76.7 ID list +101.764117 81.9 ID list +102.033866 63.3 ID list +102.266115 85.0 ID list +102.489216 89.6 ID list +102.734566 84.6 ID list +103.052322 54.8 ID list +103.306487 75.8 ID list +103.589695 60.8 ID list +103.93254 53.9 ID list +104.191151 68.6 ID list +104.423172 86.2 ID list +104.6879 67.3 ID list +105.009471 49.1 ID list +106.286776 8.7 ID list +106.524488 82.8 ID list +106.80533 84.6 ID list +107.0963 74.2 ID list +107.36523 77.5 ID list +107.637845 68.1 ID list +107.944515 66.3 ID list +108.211527 80.0 ID list +108.612501 39.5 ID list +108.887893 80.8 ID list +109.150186 70.6 ID list +109.437466 76.8 ID list +109.758197 49.5 ID list +110.018164 71.2 ID list +110.28346 68.4 ID list +110.5265 84.2 ID list +110.854727 58.0 ID list +111.10803 78.5 ID list +111.366488 72.9 ID list +111.653555 77.8 ID list +111.906902 84.2 ID list +112.154334 85.8 ID list +112.396952 76.9 ID list +112.701107 56.4 ID list +112.99003 72.3 ID list +113.251938 72.7 ID list +113.596156 66.3 ID list +113.860953 74.3 ID list +114.117908 70.4 ID list +114.392816 70.9 ID list +114.685074 62.9 ID list +114.916681 84.9 ID list +115.146729 88.1 ID list diff --git a/series-vshyba-pr-downloading.png b/series-vshyba-pr-downloading.png new file mode 100644 index 0000000..840c21f Binary files /dev/null and b/series-vshyba-pr-downloading.png differ diff --git a/series.log b/series.log index d0691a5..86e25ba 100644 --- a/series.log +++ b/series.log @@ -1,200 +1,200 @@ -0.217426 104.8 13.6 5.1 -0.407258 154.9 13.5 5.1 -0.591069 164.2 13.5 5.1 -0.8369 97.2 13.6 5.1 -1.010046 193.0 13.6 5.1 -1.181415 188.8 13.7 5.1 -1.368164 161.3 13.6 5.1 -1.555316 187.2 13.6 5.1 -1.772382 159.1 13.7 5.1 -1.954653 162.7 13.7 5.1 -2.124254 195.0 13.7 5.1 -2.301233 178.3 13.8 5.1 -2.481943 172.1 13.7 5.1 -2.663604 160.1 13.7 5.1 -2.83193 187.1 13.8 5.1 -3.011691 188.1 13.8 5.1 -3.191702 163.8 13.8 5.1 -3.369551 174.5 13.8 5.1 -3.559266 148.7 13.8 5.1 -3.744022 162.7 13.8 5.1 -3.924886 196.4 13.9 5.1 -13.290057 1.1 18.5 9.7 -13.808215 52.6 18.7 10.2 -14.249771 51.9 19.0 10.3 -14.558789 71.4 19.1 10.3 -15.234974 25.2 19.6 10.1 -16.106078 15.2 20.0 10.2 -16.816196 22.6 20.3 9.7 -17.613954 18.3 20.7 9.9 -18.911682 10.9 21.4 10.7 -19.315015 73.9 21.7 10.4 -19.885698 39.5 21.9 10.7 -20.332586 43.2 22.2 10.1 -20.71512 62.8 22.3 10.1 -20.98781 79.6 22.4 10.1 -21.406693 40.7 22.5 10.4 -21.743678 57.4 22.7 10.4 -21.994739 92.9 22.8 10.4 -22.273992 77.6 22.9 10.4 -22.649264 115.0 23.0 10.0 -22.924373 71.8 23.1 9.7 -23.122558 156.8 23.1 9.6 -23.362952 89.1 23.2 9.6 -23.676914 89.6 23.3 10.0 -23.917311 104.6 23.4 9.6 -24.106176 158.7 23.4 9.6 -24.293643 157.5 23.4 9.6 -24.50917 109.5 23.3 9.6 -24.683212 186.9 23.3 9.6 -24.87644 135.0 23.4 9.6 -25.056195 184.0 23.4 9.6 -25.239321 165.9 23.4 9.6 -25.465146 101.1 23.3 9.6 -25.645848 175.7 23.4 9.6 -25.887428 86.2 23.4 9.6 -26.068434 176.2 23.4 9.6 -26.248024 181.6 23.5 9.6 -26.452647 183.2 23.3 9.6 -26.651205 154.9 23.4 9.6 -26.848012 150.4 23.4 9.6 -27.0482 140.9 23.4 9.6 -27.254983 180.4 23.5 9.6 -27.446579 151.5 23.4 9.6 -27.640706 149.3 23.4 9.6 -27.818143 181.9 23.4 9.6 -27.997945 175.7 23.5 9.6 -28.191688 168.2 23.5 9.6 -28.384685 137.6 23.4 9.6 -28.566772 173.4 23.4 9.6 -28.751574 184.7 23.4 9.6 -28.933285 178.6 23.5 9.6 -29.148908 175.8 23.5 9.6 -29.341165 144.9 23.5 9.6 -29.54348 138.0 23.4 9.6 -29.735185 151.3 23.5 9.6 -29.939377 157.9 23.5 9.6 -30.179787 86.5 23.5 9.6 -30.370331 146.3 23.4 9.6 -30.559223 149.5 23.4 9.6 -30.745464 153.3 23.5 9.6 -30.952715 151.4 23.5 9.6 -31.157498 159.6 23.5 9.6 -31.350036 143.0 23.6 9.6 -31.546435 148.8 23.5 9.6 -31.765724 120.8 23.5 9.6 -31.976843 142.9 23.5 9.6 -32.166977 146.7 23.6 9.6 -32.363542 147.5 23.5 9.6 -32.545364 168.2 23.5 9.6 -32.758918 113.8 23.5 9.6 -32.999774 89.7 23.5 9.6 -33.204472 119.6 23.6 9.6 -33.388256 170.1 23.5 9.6 -33.574415 153.8 23.5 9.6 -33.770948 147.3 23.5 9.6 -33.994703 121.9 23.6 9.6 -34.186394 148.7 23.6 9.6 -34.400276 136.5 23.5 9.6 -34.583055 176.6 23.5 9.6 -34.780401 177.9 23.6 9.6 -34.985662 150.5 23.6 9.6 -35.17724 146.2 23.6 9.6 -35.364458 160.1 23.5 9.6 -35.547322 166.6 23.5 9.6 -35.78336 95.3 23.6 9.6 -36.017284 99.7 23.6 9.6 -36.212907 148.1 23.6 9.6 -36.408318 144.0 23.5 9.6 -36.618991 149.9 23.6 9.6 -36.827963 145.3 23.6 9.6 -37.024746 134.7 23.6 9.6 -37.227191 127.0 23.7 9.6 -37.417523 156.3 23.6 9.6 -37.616084 137.4 23.6 9.6 -37.839487 99.6 23.6 9.6 -38.040322 148.5 23.6 9.6 -38.238505 134.9 23.7 9.6 -38.459619 134.3 23.6 9.6 -38.666724 153.8 23.6 9.6 -38.872769 129.6 23.6 9.6 -39.096591 98.9 23.7 9.6 -39.283797 156.7 23.7 9.6 -39.526562 84.3 23.6 9.6 -39.76829 103.4 23.6 9.6 -39.974874 130.8 23.7 9.6 -40.173617 141.6 23.7 9.6 -40.417561 93.0 23.6 9.6 -40.621154 128.3 23.6 9.6 -40.828301 121.7 23.6 9.6 -41.035683 128.8 23.7 9.6 -41.286484 102.0 23.7 9.6 -41.498159 121.2 23.6 9.6 -41.68864 161.1 23.6 9.6 -41.912901 129.5 23.7 9.6 -42.118293 136.5 23.7 9.6 -42.370119 80.9 23.6 9.6 -42.589966 109.5 23.6 9.6 -42.79577 137.2 23.7 9.6 -43.012098 140.9 23.7 9.6 -43.246665 123.7 23.7 9.6 -43.451926 122.1 23.6 9.6 -43.651198 135.9 23.6 9.6 -43.871708 109.0 23.7 9.6 -44.072224 133.9 23.7 9.6 -44.295539 137.8 23.7 9.6 -44.49358 129.8 23.6 9.6 -44.717786 133.1 23.7 9.6 -44.946175 105.5 23.7 9.6 -45.198958 86.0 23.7 9.6 -45.40264 141.0 23.6 9.6 -45.644842 131.6 23.7 9.6 -45.841546 152.5 23.7 9.6 -46.093162 82.8 23.7 9.6 -46.295099 131.6 23.7 9.6 -46.505563 116.3 23.6 9.6 -46.717837 109.4 23.7 9.6 -46.929837 154.9 23.7 9.6 -47.190358 103.8 23.7 9.6 -47.475896 75.2 23.6 9.6 -47.767679 66.6 23.7 9.6 -48.071514 57.4 23.7 9.6 -48.278317 134.2 23.7 9.6 -48.483004 128.9 23.6 9.6 -48.719662 89.0 23.7 9.6 -48.99036 69.4 23.7 9.6 -49.186062 134.2 23.7 9.6 -49.393375 125.9 23.6 9.6 -49.60128 128.3 23.7 9.6 -49.829298 167.4 23.7 9.6 -50.02331 145.9 23.7 9.6 -50.243613 104.2 23.7 9.6 -50.424107 175.6 23.7 9.6 -50.616676 147.2 23.7 9.6 -50.876287 75.0 23.7 9.6 -51.070405 146.0 23.7 9.6 -51.257907 157.6 23.8 9.6 -51.44437 182.8 23.7 9.6 -51.655651 144.8 23.7 9.6 -51.854962 182.0 23.7 9.6 -52.042862 145.9 23.8 9.6 -52.232635 148.9 23.8 9.6 -52.416743 177.9 23.7 9.6 -52.617266 176.1 23.7 9.6 -52.821163 144.1 23.7 9.6 -53.013053 149.6 23.8 9.6 -53.209814 136.2 23.8 9.6 -53.402034 146.9 23.7 9.6 -53.612918 146.4 23.7 9.6 -53.795591 170.4 23.8 9.6 -53.985235 148.0 23.8 9.6 -54.167527 179.6 23.8 9.6 -54.359326 141.0 23.7 9.6 -54.560826 132.1 23.7 9.6 -54.752816 149.2 23.8 9.6 -54.963751 149.6 23.8 9.6 -55.152637 160.8 23.8 9.6 -55.362861 120.0 23.7 9.6 -55.555427 148.2 23.8 9.6 -55.739569 176.7 23.8 9.6 -55.931361 175.1 23.8 9.6 +0.157886 87.2 +0.261819 151.6 +0.377972 130.2 +0.470585 193.6 +0.612237 98.6 +0.715338 171.9 +0.809935 176.8 +0.924311 138.6 +1.02395 162.0 +1.123657 163.0 +1.213692 195.0 +1.316492 154.9 +1.44406 113.9 +1.577139 105.7 +1.675565 165.0 +1.762841 201.5 +1.862302 162.7 +1.965888 152.1 +2.065839 167.0 +2.166259 160.6 +2.265765 158.6 +2.365249 160.8 +2.499473 105.4 +2.621782 119.2 +2.721699 160.3 +2.842831 120.3 +2.934911 191.4 +3.022378 200.9 +3.121595 161.2 +3.210846 198.4 +3.310038 161.4 +3.465299 85.4 +3.853785 30.5 +4.064162 61.9 +4.220535 89.1 +4.401924 72.6 +4.608519 73.7 +5.021938 27.2 +5.124187 191.1 +5.224069 171.2 +5.323125 169.0 +5.409861 202.6 +5.827335 26.3 +5.911915 209.4 +6.027492 201.7 +6.339636 36.6 +6.587121 51.3 +6.989092 27.7 +7.128792 99.4 +7.305529 79.3 +7.552146 49.6 +7.680859 134.8 +7.814906 110.0 +8.201958 32.0 +8.327512 146.2 +8.510957 87.6 +9.846658 7.8 +10.291902 24.9 +10.419836 157.6 +10.530068 171.1 +10.709393 73.1 +11.184723 23.8 +11.355573 150.3 +11.474852 152.6 +11.592804 171.0 +12.935238 8.0 +13.246022 53.3 +17.511863 2.4 +21.33786 2.6 +21.568473 55.8 +23.210757 6.3 +24.044634 14.4 +28.139653 2.5 +35.019769 1.5 +39.813301 2.1 +40.64821 13.9 +40.954058 49.0 +41.212287 46.8 +41.839557 17.3 +42.699845 12.4 +45.284302 4.0 +45.74211 26.6 +47.211015 7.3 +47.439254 53.8 +49.24361 5.9 +50.549995 8.3 +51.29709 17.2 +59.845354 1.2 +65.976834 1.7 +66.708405 16.0 +71.792716 2.0 +72.01152 59.7 +72.19499 74.3 +72.324713 114.9 +72.556869 57.8 +72.779086 54.4 +72.909337 111.1 +73.052528 109.9 +73.253054 66.8 +73.552915 38.2 +73.754073 68.2 +73.950659 69.8 +74.071057 126.8 +74.248013 81.4 +74.456885 58.6 +74.698537 49.5 +74.867519 77.4 +74.987497 130.3 +75.170559 79.6 +75.362249 68.2 +75.59776 62.0 +75.717714 127.1 +75.891162 75.5 +76.174971 41.3 +76.304999 117.1 +76.545434 50.1 +76.719943 75.0 +76.901084 71.6 +77.025819 124.0 +77.23012 61.6 +77.420058 66.6 +77.641579 66.5 +77.779788 103.8 +77.979545 62.2 +78.13807 84.6 +78.267594 113.4 +78.98313 15.4 +79.111082 119.7 +79.278967 92.8 +79.462019 68.9 +79.648529 67.8 +79.764446 143.3 +79.964717 84.4 +80.154855 74.5 +80.270898 132.7 +80.452513 70.8 +80.634489 70.5 +80.750268 136.6 +80.996322 48.9 +81.153251 85.1 +81.277408 120.8 +81.46187 72.4 +81.640226 73.3 +81.783108 100.3 +81.970445 106.7 +82.163347 67.1 +82.355424 67.2 +82.514638 87.5 +82.651321 110.2 +82.916574 44.4 +83.089624 75.1 +83.204529 133.9 +83.391839 70.9 +83.570625 71.3 +83.715882 104.4 +83.960585 60.0 +84.12879 77.3 +84.24924 125.1 +84.44927 64.7 +84.625027 75.1 +84.849438 55.8 +84.993562 99.5 +85.176581 70.6 +85.286822 141.4 +85.469041 68.9 +85.589584 127.3 +85.821292 53.9 +86.011505 73.6 +86.182882 79.1 +86.314276 108.2 +86.484261 82.9 +86.715558 52.0 +86.840645 124.5 +87.026877 77.3 +87.202636 72.9 +87.410824 59.5 +87.541302 110.4 +87.772875 54.6 +87.976959 60.8 +88.158389 71.5 +88.282732 132.9 +88.443632 92.7 +88.720317 43.1 +88.897558 73.2 +89.026123 117.4 +89.217806 69.1 +89.421721 60.4 +89.669229 48.1 +89.791905 132.7 +89.962632 91.7 +90.130086 81.1 +90.242618 140.4 +90.432758 91.7 +90.713444 45.4 +91.015848 38.3 +91.161218 102.7 +91.381846 56.6 +91.647654 45.0 +91.901728 48.6 +92.095619 64.6 diff --git a/server-solsync.py b/server-solsync.py index a228845..b183f86 100644 --- a/server-solsync.py +++ b/server-solsync.py @@ -1,12 +1,15 @@ from klein import run, route -import soledad_sync +import soledad_sync as sync + + +s = None @route('/start-sync') def home(request): print "GOT REQUEST FOR STARTING SYNC..." - d = soledad_sync.upload_soledad_stuff() + d = sync.upload_soledad_stuff(s) return d @@ -15,4 +18,8 @@ def ping(request): return 'easy!' if __name__ == "__main__": + global s + s = sync._get_soledad_instance_from_uuid( + sync.UUID, 'pass', '/tmp/soledadsync', sync.HOST, '', '') + run("localhost", 8080) diff --git a/soledad_sync.py b/soledad_sync.py index 1cc22a3..136b02c 100644 --- a/soledad_sync.py +++ b/soledad_sync.py @@ -6,7 +6,8 @@ from twisted.internet import defer UUID = 'deadbeef' HOST = 'http://futeisha:2323' # HOST = 'http://localhost:2323' -NUM_DOCS = 20 +#NUM_DOCS = 20 +NUM_DOCS = 1 PAYLOAD = '/tmp/payload' # ------------------------------------------------------ @@ -31,14 +32,11 @@ def onSyncDone(result): print "SYNC DONE!", result -def upload_soledad_stuff(): +def upload_soledad_stuff(s): with open(PAYLOAD, 'r') as f: payload = f.read() - s = _get_soledad_instance_from_uuid( - UUID, 'pass', '/tmp/soledadsync', HOST, '', '') - def do_sync(_): d = s.sync() d.addCallback(onSyncDone) @@ -49,7 +47,7 @@ def upload_soledad_stuff(): cd.append(s.create_doc({'payload': payload})) d1 = defer.gatherResults(cd) - # XXX nuking out the actual sync - #d1.addCallback(do_sync) + # XXX comment out to nuke out the actual sync + d1.addCallback(do_sync) return d1 -- cgit v1.2.3