added --noisy option to enable extra logging

Makefile

@@ -12,7 +12,7 @@ else
 endif
 export PYCOIN_NATIVE=openssl
 export STORJNODE_QUERY_TIMEOUT=0.3
-#export STORJNODE_ENABLE_GLOBAL_LOGGER=1
+export STORJNODE_LOGGING_NOISY=1
 
 
 help:
@@ -82,7 +82,7 @@ test: setup
 	$(PEP8) storjnode
 	$(PEP8) examples
 	$(PEP8) tests
-	$(COVERAGE) run --source="storjnode" -m unittest --quiet tests
+	$(COVERAGE) run --source="storjnode" -m unittest --verbose tests
 	$(COVERAGE) report --fail-under=85
 
 

storjnode/api.py

@@ -32,7 +32,8 @@ def _reformat_kademlia_node(knode):
 class StorjNode(apigen.Definition):
     """Storj protocol reference implementation."""
 
-    def __init__(self, wallet=None, quiet=False, debug=False, verbose=False,
+    def __init__(self, wallet=None,
+                 quiet=False, debug=False, verbose=False, noisy=False,
                  config=storjnode.common.CONFIG_PATH):
         self._init_conifg(config)
         self._init_wallet(wallet)

storjnode/log.py

@@ -5,7 +5,7 @@
 from twisted.python import log as _log
 
 
-ENABLE_GLOBAL_LOGGER = os.environ.get("STORJNODE_ENABLE_GLOBAL_LOGGER")
+NOISY = os.environ.get("STORJNODE_LOGGING_NOISY") or "--noisy" in sys.argv
 
 
 FORMAT = "%(asctime)s %(levelname)s %(name)s %(lineno)d: %(message)s"
@@ -15,12 +15,12 @@
 
 
 # make twisted use standard library logging module
-_observer = _log.PythonLoggingObserver()  # pragma: no cover
-_observer.start()  # pragma: no cover
+_observer = _log.PythonLoggingObserver()
+_observer.start()
 
 
 # silence global logger
-if ENABLE_GLOBAL_LOGGER:
+if NOISY:
     _logging.basicConfig(format=FORMAT)
 else:
     _logging.basicConfig(format=FORMAT, level=LEVEL_QUIET)

storjnode/network/protocol.py

@@ -38,9 +38,9 @@ def __init__(self, *args, **kwargs):
         self.messages_received = Queue(maxsize=max_messages)
         KademliaProtocol.__init__(self, *args, **kwargs)
         self.log = storjnode.log.getLogger("kademlia.protocol")
-        if not storjnode.log.ENABLE_GLOBAL_LOGGER:
-            self.log.setLevel(60)
-        self.noisy = False
+        if not storjnode.log.NOISY:
+            self.log.setLevel(storjnode.log.LEVEL_QUIET)
+        self.noisy = storjnode.log.NOISY
 
     def has_messages(self):
         return not self.messages_received.empty()

storjnode/network/server.py

@@ -121,8 +121,8 @@ def __init__(self, key, port, ksize=20, alpha=3, storage=None,
         self.ksize = ksize
         self.alpha = alpha
         self.log = storjnode.log.getLogger("kademlia.network")
-        if not storjnode.log.ENABLE_GLOBAL_LOGGER:
-            self.log.setLevel(60)
+        if not storjnode.log.NOISY:
+            self.log.setLevel(storjnode.log.LEVEL_QUIET)
 
         self.storage = storage or ForgetfulStorage()
         self.node = KademliaNode(self.get_id())