[tor-commits] [ooni-probe/master] Add assets directory

[art at torproject.org]

commit f92bfe90bb020e748304f53556d0b692d704113a
Author: Arturo Filastò <hellais at gmail.com>
Date:   Tue Feb 7 22:35:20 2012 +0100

    Add assets directory
---
 .gitignore                     |    1 +
 refactor/assets/testasset.txt  |    8 --------
 refactor/assets/testasset2.txt |    8 --------
 refactor/plugoo.py             |    5 +++--
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index b1e99aa..5d58673 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ proxy-lists/ip-cc.txt
 proxy-lists/ips.txt
 proxy-lists/italy-dns-ips.txt
 proxy-lists/italy-http-ips.txt
+refactor/assets/*
diff --git a/refactor/assets/testasset.txt b/refactor/assets/testasset.txt
deleted file mode 100644
index 274e331..0000000
--- a/refactor/assets/testasset.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# This an example ooni-probe asset file.
-# The properties of assets are definied with the "#:" syntax
-#:name The asset name
-#:desc The description of this asset is bla bla bla bla bla
-#:tests testa,testb,testc
-#:files something.xml,somethingelse.xml
-This is the main body of the assets.
-bla bla bla
\ No newline at end of file
diff --git a/refactor/assets/testasset2.txt b/refactor/assets/testasset2.txt
deleted file mode 100644
index 71bbabc..0000000
--- a/refactor/assets/testasset2.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# This an example ooni-probe asset file.
-# The properties of assets are definied with the "#:" syntax
-#:name Another asset
-#:desc The description of this asset is bla bla1321212
-#:tests testa,testb,testd
-#:files something.xml,somethingelse.xml
-This is the main body of the assets.
-bla bla bla
diff --git a/refactor/plugoo.py b/refactor/plugoo.py
index 84eef01..0a41a2c 100644
--- a/refactor/plugoo.py
+++ b/refactor/plugoo.py
@@ -102,8 +102,7 @@ class Report:
         This should be invoked every time you wish to write some
         data to the reporting system
         """
-        print "Writing report(s)"
-        self.logger.info("Writing report(s)")
+        #print "Writing report(s)"
         dump = "- " + yaml.dump(data)
         reports = []
 
@@ -297,6 +296,7 @@ class Plugoo():
                     gevent.joinall(jobs, timeout=timeout)
                     for job in jobs:
                         #print "JOB VAL: %s" % job.value
+                        self.logger.info("Writing report(s)")
                         self.report(job.value)
                         job.kill()
                     jobs = []
@@ -305,6 +305,7 @@ class Plugoo():
                 gevent.joinall(jobs, timeout=timeout)
                 for job in jobs:
                     #print "JOB VAL: %s" % job.value
+                    self.logger.info("Writing report(s)")
                     self.report(job.value)
                     job.kill()
                 jobs = []