1 files changed, 28 insertions, 9 deletions
diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index 28629ff..04af448 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -25,9 +25,6 @@ import random
 
 import stem.control
 
-from twisted.web import server, resource
-from twisted.internet import reactor
-
 import StringIO
 import socket
 import urllib
@@ -39,6 +36,8 @@ import Queue
 import chutney.Templating
 import chutney.Traffic
 
+import logging
+
 def mkdir_p(d, mode=0777):
     """Create directory 'd' and all of its parents as needed.  Unlike
        os.makedirs, does not give an error if d already exists.
@@ -750,15 +749,12 @@ def runConfigFile(verb, f):
     _GLOBALS = dict(_BASE_ENVIRON = _BASE_ENVIRON,
                     Node=Node,
                     EventType=stem.control.EventType,
-                    server=server,
-                    resource=resource,
-                    reactor=reactor,
                     time=time,
                     thread=thread,
                     Queue=Queue,
                     random=random,
                     threading=threading,
-                    log=log,
+                    logging=logging,
                     stop=stop,
                     _THE_NETWORK=_THE_NETWORK)
 
@@ -779,8 +775,14 @@ def runConfigFile(verb, f):
 
     return getattr(network, verb)()
 
-def log(string):
-    print(time.strftime("%b %d %H:%M:%S.000") + " " + str(string))
+def logold(string, show=True):
+    output = time.strftime("%b %d %H:%M:%S.000") + " " + str(string)
+
+    f = open('log.log', 'w')
+    f.write(output)
+
+    if show:
+        print(output)
 
 def signal_handler(signal, frame):
     _THE_NETWORK.stop()
@@ -793,6 +795,23 @@ def main():
     _BASE_ENVIRON = chutney.Templating.Environ(**DEFAULTS)
     _THE_NETWORK = Network(_BASE_ENVIRON)
 
+    logger = logging.getLogger()
+    logger.setLevel(logging.DEBUG)
+
+    # create console handler and set level to info
+    handler = logging.StreamHandler()
+    handler.setLevel(logging.INFO)
+    formatter = logging.Formatter("%(asctime)s %(message)s", datefmt="%b %d %H:%M:%S.000")
+    handler.setFormatter(formatter)
+    logger.addHandler(handler)
+
+    # create debug file handler and set level to debug
+    handler = logging.FileHandler(os.path.join(".", "chutney.log"), "w")
+    handler.setLevel(logging.DEBUG)
+    formatter = logging.Formatter("%(asctime)s %(message)s", datefmt="%b %d %H:%M:%S.000")
+    handler.setFormatter(formatter)
+    logger.addHandler(handler)
+
     if len(sys.argv) < 3:
         print usage(_THE_NETWORK)
         print "Error: Not enough arguments given."