commit 362d14e27a076edc5c1edd4347260617d637b69a Author: Damian Johnson atagar@torproject.org Date: Sun Sep 15 12:27:18 2013 -0700
Making ~/.arm if it doesn't exist
Our --debug argument was busted since it wouldn't make a directory for ~/.arm/log when it didn't exist. --- arm/starter.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/arm/starter.py b/arm/starter.py index 289d099..e2eae69 100644 --- a/arm/starter.py +++ b/arm/starter.py @@ -43,6 +43,7 @@ CONFIG = stem.util.conf.config_dict("arm", { 'msg.unreadable_cookie_file': '', 'msg.tor_is_running_as_root': '', 'msg.arm_is_running_as_root': '', + 'msg.config_not_found': '', 'msg.unable_to_read_config': '', })
@@ -265,6 +266,7 @@ def _dumpConfig(): stem.util.log.debug(armConfigEntry.strip()) stem.util.log.debug(torConfigEntry.strip())
+ def main(): startTime = time.time()
@@ -314,7 +316,12 @@ def main(): if args.debug: try: stem_logger = stem.util.log.get_logger() - + + debug_dir = os.path.dirname(LOG_DUMP_PATH) + + if not os.path.exists(debug_dir): + os.makedirs(debug_dir) + debugHandler = logging.FileHandler(LOG_DUMP_PATH) debugHandler.setLevel(stem.util.log.logging_level(stem.util.log.TRACE)) debugHandler.setFormatter(logging.Formatter( @@ -326,7 +333,7 @@ def main():
currentTime = time.localtime() timeLabel = time.strftime("%H:%M:%S %m/%d/%Y (%Z)", currentTime) - initMsg = "Arm %s Debug Dump, %s" % (version.VERSION, timeLabel) + initMsg = "Arm %s Debug Dump, %s" % (__version__, timeLabel) pythonVersionLabel = "Python Version: %s" % (".".join([str(arg) for arg in sys.version_info[:3]])) osLabel = "Platform: %s (%s)" % (platform.system(), " ".join(platform.dist()))
@@ -414,4 +421,3 @@ def main():
if __name__ == '__main__': main() -